页面修改

Edu.Module.Customer/CustomerCommissionModule.cs

@@ -119,9 +119,9 @@ namespace Edu.Module.Course
         /// </summary>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Order_ReturnComission_ViewModel> GetCommissionUserList(RB_Order_ReturnComission_ViewModel dmodel)
+        public List<RB_Order_ReturnComission_ViewModel> GetCommissionUserListModule(RB_Order_ReturnComission_ViewModel dmodel)
         {
-            var list = order_ReturnComissionRepository.GetCommissionUserList(dmodel);
+            var list = order_ReturnComissionRepository.GetCommissionUserListRepository(dmodel);
             if (list.Any())
             {
                 //分成三个部门  内部人员  同行  学员

Edu.Repository/Sell/RB_Order_ReturnComissionRepository.cs

@@ -159,7 +159,7 @@ where {where} order by r.Id desc";
         /// </summary>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Order_ReturnComission_ViewModel> GetCommissionUserList(RB_Order_ReturnComission_ViewModel demodel)
+        public List<RB_Order_ReturnComission_ViewModel> GetCommissionUserListRepository(RB_Order_ReturnComission_ViewModel demodel)
         {
             string where = $@" 1=1";
 
@@ -204,8 +204,11 @@ where {where} order by r.Id desc";
                 where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.Status)} in(1,2)";
             }
 
-            string sql = $@" select r.OrderSourceType,r.OrderSourceId,r.SchoolId,count(0) as StudentCount,sum(r.CommissionMoeny) as CommissionMoeny
-from RB_Order_ReturnComission r where {where} group by r.OrderSourceType,r.OrderSourceId,r.SchoolId";
+            string sql = $@" 
+select r.OrderSourceType,r.OrderSourceId,r.SchoolId,count(0) as StudentCount,sum(r.CommissionMoeny) as CommissionMoeny
+from RB_Order_ReturnComission r 
+where {where} 
+group by r.OrderSourceType,r.OrderSourceId,r.SchoolId";
             return Get<RB_Order_ReturnComission_ViewModel>(sql).ToList();
         }
 

Edu.WebApi/Controllers/Customer/CustomerCommissionController.cs

@@ -132,7 +132,7 @@ namespace Edu.WebApi.Controllers.Course
                 return ApiResult.ParamIsNull("请传递期数id");
             }
 
-            var list = customerCommissionModule.GetCommissionUserList(dmodel);
+            var list = customerCommissionModule.GetCommissionUserListModule(dmodel);
             if (dmodel.UserDept > 0)
             {
                 list = list.Where(x => x.UserDept == dmodel.UserDept).ToList();
@@ -341,15 +341,15 @@ namespace Edu.WebApi.Controllers.Course
             {
                 financeConfig = new RB_Finance_Config_ViewModel();
             }
-            var list = customerCommissionModule.GetCommissionUserList(dmodel);
-            if (list == null || !list.Any(x => x.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.EmployeeInput))
+            var list = customerCommissionModule.GetCommissionUserListModule(dmodel);
+            if (list == null || !list.Any(x => x.OrderSourceType == StuCreateTypeEnum.EmployeeInput))
             {
                 return ApiResult.Failed("暂无个人直客数据");
             }
             List<object> financeList = new List<object>();
-            foreach (var item in list.Where(x => x.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.EmployeeInput).GroupBy(x => x.SchoolId))//先区分出校区
+            foreach (var item in list.Where(x => x.OrderSourceType == StuCreateTypeEnum.EmployeeInput).GroupBy(x => x.SchoolId))//先区分出校区
             {
-                foreach (var deptItem in list.Where(x => x.SchoolId == item.Key && x.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.EmployeeInput).GroupBy(x => x.UserDept))//区分出同一个校区不同部门
+                foreach (var deptItem in list.Where(x => x.SchoolId == item.Key && x.OrderSourceType == StuCreateTypeEnum.EmployeeInput).GroupBy(x => x.UserDept))//区分出同一个校区不同部门
                 {
                     var tempList = list.Where(x => x.SchoolId == item.Key && x.UserDept == deptItem.Key);
                     if (tempList != null && tempList.Any())
@@ -433,7 +433,7 @@ namespace Edu.WebApi.Controllers.Course
                 msg = sign,
             };
             System.Threading.Tasks.Task.Run(() =>
-               SetFinance(resultInfo, dmodel.BatchId)
+             SetFinance(resultInfo, dmodel.BatchId)
             );
             return ApiResult.Success("财务单据生成中，请稍后刷新查看");
         }

Edu.WebApi/appsettings.json

@@ -34,11 +34,11 @@
   "MongoDBName": "Edu",
   "WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/",
   "FinanceKey": "FinanceMallInsertToERPViitto2020",
-  "PaymentFinanceApi": "http://192.168.10.65:8083/api/Mall/InsertFinanceBatchForMallOut",
-  "IncomeFinanceApi": "http://192.168.10.65:8083/api/Mall/InsertFinanceBatchForMallIn",
+  "PaymentFinanceApi": "http://192.168.10.214/api/Mall/InsertFinanceBatchForMallOut",
+  "IncomeFinanceApi": "http://192.168.10.214/api/Mall/InsertFinanceBatchForMallIn",
   "sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址
   "sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址
-  "SellFinanceApi": "http://127.0.0.1/api/Mall/InsertFinanceBatchForEduOut",
+  "SellFinanceApi": "http://192.168.10.214/api/Mall/InsertFinanceBatchForEduOut",
   "FinanceDateBase": "reborn_finance",
   "EduDateBase": "reborn_edu",
   "JHTenantId": "15",