Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Common/Config.cs

@@ -417,6 +417,15 @@ namespace Mall.Common
             }
         }
 
-
+        /// <summary>
+        /// 微信支付结算率0.60%
+        /// </summary>
+        public static string SettlementRate
+        {
+            get
+            {
+                return new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("SettlementRate").Value;
+            }
+        }
     }
 }
\ No newline at end of file

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -261,7 +261,7 @@ namespace Mall.Module.MarketingCenter
                                     height = subItem["height"].ToString(),
                                     left = subItem["left"].ToString(),
                                     top = subItem["top"].ToString(),
-                                    pic_url = subItem["pic_url"].ToString(),
+                                    pic_url = Common.Config.GetFileUrl(subItem["pic_url"].ToString()) ,
                                     backgroundImage = subItem["backgroundImage"].ToString(),
                                     backgroundRepeat = subItem["backgroundRepeat"].ToString(),
                                     backgroundSize = subItem["backgroundSize"].ToString(),

Mall.Module.Product/OrderModule.cs

@@ -6445,7 +6445,7 @@ namespace Mall.Module.Product
                 return false;
             }
             Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
-                { nameof(RB_Goods_OrderDetail.FreightMoney),freightMoney }
+                { nameof(RB_Goods_OrderDetail.FreightCostMoney),freightMoney }
             };
             List<WhereHelper> wheres1 = new List<WhereHelper>() {
                 new WhereHelper(){

Mall.WebApi/appsettings.json

@@ -24,16 +24,18 @@
   "Mongo": "mongodb://192.168.2.214:27017",
   "MongoDBName": "Mall",
   "ProjectUrl": "D:/project/GitProject/mallapp",
-  "DeveloperKitsPort": "63994",
+  "DeveloperKitsPort": "15720",
   "FirstPage": "pages/index/index.html",
   "ByteDanceSendTemplate": "https://developer.toutiao.com/api/apps/game/template/send",
-  "sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信回调地址
+  "sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信商品回调地址
+  "sTenpayRechargeNotify": "http://mallapi.oytour.com/api/WeChatNotify/RechargeNotify", //微信充值回调地址
   "NetworkDirector": 1756, //网络主管的id，用于新建供应商账户的时候的创建人
   "RB_Branch_Id": 49, //所属公司id
   "RebornDMC": "reborn_dmc",
   "IncomeFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallIn",
   "PaymentFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallOut",
   "FinanceKey": "FinanceMallInsertToERPViitto2020",
+  "SettlementRate": "0.60",
   "RedisSetting": {
     "RedisServer": "192.168.2.214",
     "RedisPort": "6379",

Mall.WindowsService/Module/FinanceModule.cs

@@ -207,13 +207,13 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                                 {
 
 
-                                    decimal OriginalFee = 0;
+                                    //decimal OriginalFee = 0;
 
-                                    var goodsDetailGroupList = goodsDetailList.GroupBy(x => x.OrderId);
-                                    foreach (var goodsDetailGroupItem in goodsDetailGroupList)
-                                    {
-                                        OriginalFee += goodsDetailList.Where(x => x.OrderId == goodsDetailGroupItem.Key).Sum(x => (x.FreightMoney ?? 0) + (x.Final_Price ?? 0)) * (Convert.ToDecimal(Config.SettlementRate) / 100);
-                                    }
+                                    //var goodsDetailGroupList = goodsDetailList.GroupBy(x => x.OrderId);
+                                    //foreach (var goodsDetailGroupItem in goodsDetailGroupList)
+                                    //{
+                                    //    OriginalFee += goodsDetailList.Where(x => x.OrderId == goodsDetailGroupItem.Key).Sum(x => (x.FreightMoney ?? 0) + (x.Final_Price ?? 0)) * (Convert.ToDecimal(Config.SettlementRate) / 100);
+                                    //}
                                     var detailList = result.Select(x => new
                                     {
                                         CostTypeId = x.FinanceType == 1 ? item.IncomeCostTypeId : item.FreightCostTypeId,