提交代码

Mall.Common/Config.cs

@@ -658,6 +658,18 @@ namespace Mall.Common
             }
         }
 
+        /// <summary>
+        /// 微信支付结算率0.540%
+        /// </summary>
+        public static string EduSettlementRate
+        {
+            get
+            {
+                return ReadConfigKey("EduSettlementRate");
+            }
+        }
+        
+
         /// <summary>
         /// 资产管理数据库
         /// </summary>
@@ -720,6 +732,17 @@ namespace Mall.Common
                 return ReadConfigKey("XuZongUserId");
             }
         }
+
+        /// <summary>
+        /// 教育erp徐总的id，用于区分线下订单
+        /// </summary>
+        public static string EduXuZongId
+        {
+            get
+            {
+                return ReadConfigKey("EduXuZongId");
+            }
+        }
         /// <summary>
         ///首店企业认证是否自动审核，1-是 
         /// </summary>

Mall.Module.Product/OrderModule.cs

@@ -4235,6 +4235,10 @@ namespace Mall.Module.Product
 
             #region 手续费计算
             decimal ServiceCharge = Convert.ToDecimal(Config.SettlementRate) / 100;
+            if (demodel.VersionSource == 1)
+            {
+                ServiceCharge = Convert.ToDecimal(Config.EduSettlementRate) / 100;
+            }
             if (ServiceCharge > 0)
             {
                 decimal TotalFee = Math.Round((demodel.Income ?? 0) * ServiceCharge, 2, MidpointRounding.AwayFromZero);
@@ -4526,8 +4530,15 @@ namespace Mall.Module.Product
                         {
                             eduUserId = eduSellModel.EduSellId;
                         }
+                        else
+                        {
+                            eduUserId = Convert.ToInt32(Config.EduXuZongId ?? "2602");
+                        }
 
                     }
+                    else {
+                        eduUserId = Convert.ToInt32(Config.EduXuZongId ?? "2602");
+                    }
                 }
                 Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                     { nameof(RB_Goods_Order_Extend.UserTree),parentIds },
@@ -6683,7 +6694,8 @@ namespace Mall.Module.Product
                     return "该订单已返佣，无法重置返佣数据";
                 }
             }
-            else {
+            else
+            {
                 return "历史返佣不存在，请联系管理员处理";
             }
             //删除原返佣记录
@@ -8395,7 +8407,7 @@ namespace Mall.Module.Product
                             {
                                 Msg = new { Order = classIdList },
                             };
-                            System.Threading.Tasks.Task.Run(() =>  Common.Plugin.HttpHelper.HttpPost(Config.ReadConfigKey("EduUpdateGoodsSpecification"), JsonHelper.Serialize(resultInfo), "")) ;
+                            System.Threading.Tasks.Task.Run(() => Common.Plugin.HttpHelper.HttpPost(Config.ReadConfigKey("EduUpdateGoodsSpecification"), JsonHelper.Serialize(resultInfo), ""));
                         }
 
                     }

Mall.Module.User/UserCommonModule.cs

@@ -2071,7 +2071,7 @@ namespace Mall.Module.User
             {
                 var resultInfo = new
                 {
-                    Msg = new { Order = classList, EnterID = model.EduUserId > 0 ? model.EduUserId : 1 },
+                    Msg = new { Order = classList, EnterID = model.EduUserId > 0 ? model.EduUserId : Convert.ToInt32(Config.EduXuZongId??"2602") },
                 };
                 string apiResult = Common.Plugin.HttpHelper.HttpPost(Config.ReadConfigKey("EduOrderApi"), JsonHelper.Serialize(resultInfo), "");
                 Newtonsoft.Json.Linq.JObject parmsJob = Newtonsoft.Json.Linq.JObject.Parse(apiResult);

Mall.WebApi/appsettings.json

 {
     "ConnectionStrings": {
-        "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+        "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
         "DefaultConnectionPName": "MySql.Data.MySqlClient",
         "FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
         "FinanceConnectionPName": "MySql.Data.MySqlClient",
@@ -63,6 +63,8 @@
     "EduUpdateGoodsSpecification": "http://192.168.20.17:8017/api/Order/UpdateGoodsSpecification",
     "FinanceKey": "FinanceMallInsertToERPViitto2020",
     "SettlementRate": "0.60",
+    "EduSettlementRate": "0.54",
+    "EduXuZongId": 2602, //徐总的id，用于区分线下订单
     "EduActivityIncomeFinanceId": "9",
     "EduActivityExpendFinanceId": "9",
     "EduRollCallActionCode": "ActivityRollCall",
@@ -81,7 +83,7 @@
     "VirtualDirectory": "WebFile",
     "FileService": "2",
     "IsNormalServer": 2,
-    "IsFirtsShopAutoExamine": 1,//首店企业认证是否字段审核
+    "IsFirtsShopAutoExamine": 1, //首店企业认证是否字段审核
     "FinanceSetting": {
         "TenantId": 1,
         "MallBaseId": 1,