页面修改

Edu.WebApi/Controllers/Customer/CustomerCommissionController.cs

@@ -35,7 +35,7 @@ namespace Edu.WebApi.Controllers.Course
         /// 财务配置
         /// </summary>
         private readonly EducationContractModule educationContractModule = new EducationContractModule();
- 
+
 
         #region 获取首页返佣
         /// <summary>
@@ -117,15 +117,15 @@ namespace Edu.WebApi.Controllers.Course
             var userInfo = base.UserInfo;
             var dmodel = new RB_Order_ReturnComission_ViewModel()
             {
-                BatchId=base.ParmJObj.GetInt("BatchId"),
-                OrderSourceId=base.ParmJObj.GetInt("OrderSourceId"),
-                OrderSourceType=(StuCreateTypeEnum)base.ParmJObj.GetInt("OrderSourceType"),
-                Q_SelectNormal=base.ParmJObj.GetInt("Q_SelectNormal"),
-                Status=base.ParmJObj.GetInt("Status"),
-                UserDept=base.ParmJObj.GetInt("UserDept"),
-                SchoolId=base.ParmJObj.GetInt("SchoolId"),
+                BatchId = base.ParmJObj.GetInt("BatchId"),
+                OrderSourceId = base.ParmJObj.GetInt("OrderSourceId"),
+                OrderSourceType = (StuCreateTypeEnum)base.ParmJObj.GetInt("OrderSourceType"),
+                Q_SelectNormal = base.ParmJObj.GetInt("Q_SelectNormal"),
+                Status = base.ParmJObj.GetInt("Status"),
+                UserDept = base.ParmJObj.GetInt("UserDept"),
+                SchoolId = base.ParmJObj.GetInt("SchoolId"),
             };
-            
+
             dmodel.GroupId = userInfo.Group_Id;
             if (dmodel.BatchId <= 0)
             {
@@ -135,7 +135,7 @@ namespace Edu.WebApi.Controllers.Course
             var list = customerCommissionModule.GetCommissionUserList(dmodel);
             if (dmodel.UserDept > 0)
             {
-                //list = list.Where(x => x.UserDept == dmodel.UserDept).ToList();
+                list = list.Where(x => x.UserDept == dmodel.UserDept).ToList();
             }
             return ApiResult.Success("", list.Select(x => new
             {
@@ -322,7 +322,15 @@ namespace Edu.WebApi.Controllers.Course
         public ApiResult SetBatchFinance()
         {
             var userInfo = base.UserInfo;
-            var dmodel = JsonHelper.DeserializeObject<RB_Order_ReturnComission_ViewModel>(RequestParm.Msg.ToString());
+            var dmodel = new RB_Order_ReturnComission_ViewModel()
+            {
+                BatchId = base.ParmJObj.GetInt("BatchId"),
+                OrderSourceId = base.ParmJObj.GetInt("OrderSourceId"),
+                OrderSourceType = (StuCreateTypeEnum)base.ParmJObj.GetInt("OrderSourceType"),
+                Q_SelectNormal = base.ParmJObj.GetInt("Q_SelectNormal"),
+                SchoolId = base.ParmJObj.GetInt("SchoolId"),
+                Status = base.ParmJObj.GetInt("Status"),
+            };
             dmodel.GroupId = userInfo.Group_Id;
             if (dmodel.BatchId <= 0)
             {
@@ -371,7 +379,6 @@ namespace Edu.WebApi.Controllers.Course
                                 };
                                 deptList.Add(deptObj);
                             }
-
                         }
                         var financeModel = new
                         {
@@ -389,7 +396,7 @@ namespace Edu.WebApi.Controllers.Course
                             PayMoney = 0,
                             OtherType = 53,
                             ReFinanceId2 = deptItem.Key,
-                            ReFinanceId = tempList.FirstOrDefault().BatchId,
+                            ReFinanceId = dmodel.BatchId,
                             Status = 1,
                             Fee = 0,
                             IsPublic = 1,//配置信息
@@ -416,9 +423,7 @@ namespace Edu.WebApi.Controllers.Course
                             RB_CreateByName = userInfo.AccountName,
                             RB_GroupName = userInfo.GroupName,
                         };
-
                         financeList.Add(financeModel);
-
                     }
                 }
             }
@@ -427,7 +432,9 @@ namespace Edu.WebApi.Controllers.Course
             {
                 msg = sign,
             };
-            System.Threading.Tasks.Task.Run(() => SetFinance(resultInfo, dmodel.BatchId));
+            System.Threading.Tasks.Task.Run(() =>
+               SetFinance(resultInfo, dmodel.BatchId)
+            );
             return ApiResult.Success("财务单据生成中，请稍后刷新查看");
         }
 
@@ -443,17 +450,13 @@ namespace Edu.WebApi.Controllers.Course
             string resultCode = parmsJob.GetStringValue("resultCode");
             string message = parmsJob.GetStringValue("message");
             string frid = parmsJob.GetStringValue("data");
-
             if (resultCode == "1" && !string.IsNullOrWhiteSpace(frid))//新增记录
             {
                 bool result = customerCommissionModule.UdateReturnMoneyModule(frid.Trim('"'), BatchId);
-
             }
         }
         #endregion
 
-
-
         #region 员工申请提现
 
         public ApiResult SetWithdrawal()