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

Mall.Module.Product/OrderModule.cs

@@ -7069,8 +7069,8 @@ namespace Mall.Module.Product
             };
             List<WhereHelper> wheres1 = new List<WhereHelper>() {
                 new WhereHelper(){
-                        FiledName=nameof(RB_Goods_OrderDetail.OrderId),
-                        FiledValue=orderModel.OrderId,
+                        FiledName=nameof(RB_Goods_OrderDetail.Id),
+                        FiledValue=orderModel.Id,
                         OperatorEnum=OperatorEnum.Equal
                 },
                 new WhereHelper(){
@@ -7125,8 +7125,8 @@ namespace Mall.Module.Product
             };
             List<WhereHelper> wheres1 = new List<WhereHelper>() {
                 new WhereHelper(){
-                        FiledName=nameof(RB_Goods_OrderDetail.OrderId),
-                        FiledValue=orderModel.OrderId,
+                        FiledName=nameof(RB_Goods_OrderDetail.Id),
+                        FiledValue=orderModel.Id,
                         OperatorEnum=OperatorEnum.Equal
                 },
                 new WhereHelper(){

Mall.WebApi/Controllers/User/UserController.cs

@@ -2968,12 +2968,18 @@ namespace Mall.WebApi.Controllers.User
         public ApiResult SetFXFxCommissionInfo()
         {
             var req = RequestParm;
-            RB_Distributor_FXGrade_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_FXGrade_Extend>(req.msg.ToString());
-            if (demodel.FXCommissionList.Any(x => x.CommissionPrice < 0))
+            List<RB_Distributor_FXGrade_Extend> demodel = JsonConvert.DeserializeObject<List<RB_Distributor_FXGrade_Extend>>(req.msg.ToString());
+
+            List<RB_Distributor_FXCommission_Extend> list = new List<RB_Distributor_FXCommission_Extend>();
+            foreach (var item in demodel)
+            {
+                list.AddRange(item.FXCommissionList);
+            }
+            if (list.Any(x => x.CommissionPrice < 0))
             {
                 return ApiResult.Failed("返佣价格不能小于0");
             }
-            bool flag = userModule.AddOrUpdateFxCommission(demodel.FXCommissionList);
+            bool flag = userModule.AddOrUpdateFxCommission(list);
             if (flag)
             {
                 return ApiResult.Success();
@@ -2985,6 +2991,7 @@ namespace Mall.WebApi.Controllers.User
         }
 
 
+
         #endregion
     }
 }
\ No newline at end of file