1

Edu.Model/Entity/Sell/RB_Order.cs

@@ -432,7 +432,7 @@ namespace Edu.Model.Entity.Sell
         public int OrderIdentify { get; set; }
 
         /// <summary>
-        /// 同行返佣   1按课耗反    2付款返佣
+        /// 返佣类型(1比例返佣,2-固定金额返佣)
         /// </summary>
         public int CommissionReType { get; set; }
     }

Edu.Repository/Sell/RB_Order_ReturnComissionRepository.cs

@@ -40,7 +40,7 @@ namespace Edu.Repository.Sell
 
             DynamicParameters parameters = new DynamicParameters();
             parameters.Add("gid", groupId);
-            parameters.Add("type", groupId);
+            parameters.Add("type", type);
 
             return Get<RB_Order_ReturnComission_ViewModel>(sql, parameters).ToList();
         }
@@ -53,7 +53,7 @@ namespace Edu.Repository.Sell
         /// <returns></returns>
         public bool UpdateModelByBatch(int batchId,string ids)
         {
-            var sql = $"update rb_order_returncomission set Status=1,BatchId={batchId} where Id in(ids)";
+            var sql = $"update rb_order_returncomission set Status=1,BatchId={batchId} where Id in({ids})";
 
             return Execute(sql, null) > 0;
         }
@@ -100,7 +100,7 @@ namespace Edu.Repository.Sell
             }
             if (demodel.OrderSourceType > 0)
             {
-                where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.OrderSourceType)} ={demodel.OrderSourceType}";
+                where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.OrderSourceType)} ={(int)demodel.OrderSourceType}";
             }
             if (demodel.OrderSourceId > 0)
             {
@@ -163,7 +163,7 @@ where {where} order by r.Id desc";
             }
             if (demodel.OrderSourceType > 0)
             {
-                where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.OrderSourceType)} ={demodel.OrderSourceType}";
+                where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.OrderSourceType)} ={(int)demodel.OrderSourceType}";
             }
             if (demodel.OrderSourceId > 0)
             {
@@ -222,7 +222,7 @@ from RB_Order_ReturnComission r where {where} group by r.OrderSourceType,r.Order
             }
             if (demodel.OrderSourceType > 0)
             {
-                where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.OrderSourceType)} ={demodel.OrderSourceType}";
+                where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.OrderSourceType)} ={(int)demodel.OrderSourceType}";
             }
             if (demodel.OrderSourceId > 0)
             {

Edu.Repository/Sell/RB_ReturnMoney_BatchRepository.cs

@@ -76,14 +76,8 @@ namespace Edu.Repository.Sell
         /// <returns></returns>
         public bool ExsitModelByMonth(int groupId,string month,int type)
         {
-            var sql = "select Count(0) from RB_ReturnMoney_Batch a where a.GroupId=@gid and DATE_FORMAT(a.CreateDate,'%Y-%m')=@month and a.CommissionType=@type";
-            DynamicParameters parameters = new DynamicParameters();
-            parameters.Add("gid", groupId);
-            parameters.Add("month", month);
-            parameters.Add("type", type);
-
-            var result = ExecuteScalar(sql, parameters);
-
+            var sql = $@"select Count(0) from RB_ReturnMoney_Batch a where a.GroupId={groupId} and DATE_FORMAT(a.CreateDate,'%Y-%m')='{month}' and a.CommissionType={type}";
+            var result = ExecuteScalar(sql);
             return Convert.ToInt32(result) > 0;
         }
     }

Edu.WebApi/Controllers/Customer/CustomerCommissionController.cs

@@ -143,6 +143,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.SchoolName,
                     x.UserName,
                     x.OrderSourceType,
+                    OrderSourceTypeName = x.OrderSourceType.ToName(),
                     x.OrderSourceId,
                     x.ClassId,
                     x.ClassName,
@@ -154,7 +155,8 @@ namespace Edu.WebApi.Controllers.Course
                     x.BatchId,
                     x.BatchName,
                     x.StuId,
-                    x.StuName
+                    x.StuName,
+                    x.CommissionType
                 })
             };
             return ApiResult.Success("", pageModel);
@@ -231,8 +233,8 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
-                            new ExcelColumn(value: TotalMoney.ToString("#0.00")){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: TotalMoney.ToString("#0.00")){ },                            
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },