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

Edu.Repository/Sell/RB_Sell_Achievements_DetailsRepository.cs

@@ -53,6 +53,14 @@ namespace Edu.Repository.Sell
             {
                 where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.OrderId)} in({demodel.OrderIds})";
             }
+            if (demodel.UserType > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.UserType)} ={demodel.UserType}";
+            }
+            if (demodel.IsDept > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsDept)} ={demodel.IsDept}";
+            }
 
 
             string sql = $@" select r.* from RB_Sell_Achievements_Details r where {where} order by r.Id asc";
@@ -96,6 +104,14 @@ namespace Edu.Repository.Sell
             {
                 where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.OrderId)} in({demodel.OrderIds})";
             }
+            if (demodel.UserType > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.UserType)} ={demodel.UserType}";
+            }
+            if (demodel.IsDept > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsDept)} ={demodel.IsDept}";
+            }
 
 
             string sql = $@" select r.*,
@@ -144,7 +160,14 @@ from RB_Sell_Achievements_Details r where {where} order by r.Id asc";
             {
                 where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.OrderId)} ={demodel.OrderId}";
             }
-
+            if (demodel.UserType > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.UserType)} ={demodel.UserType}";
+            }
+            if (demodel.IsDept > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsDept)} ={demodel.IsDept}";
+            }
 
             string sql = $@" select r.* from RB_Sell_Achievements_Details r where {where} order by r.Id desc";
             return GetPage<RB_Sell_Achievements_Details_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
@@ -183,6 +206,14 @@ from RB_Sell_Achievements_Details r where {where} order by r.Id asc";
             {
                 where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.OrderId)} ={demodel.OrderId}";
             }
+            if (demodel.UserType > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.UserType)} ={demodel.UserType}";
+            }
+            if (demodel.IsDept > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsDept)} ={demodel.IsDept}";
+            }
 
 
             string sql = $@" select r.UserId,r.Depart_Id,r.School_Id,sum(r.StudentCount) as StudentCount,sum(r.CurrentPeriodMoney + r.DeductionMoney) as CurrentPeriodMoney
@@ -242,6 +273,14 @@ GROUP BY PeriodId ";
             {
                 where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.OrderId)} ={demodel.OrderId}";
             }
+            if (demodel.UserType > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.UserType)} ={demodel.UserType}";
+            }
+            if (demodel.IsDept > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsDept)} ={demodel.IsDept}";
+            }
 
 
             string sql = $@" select sum(r.CurrentPeriodMoney + r.DeductionMoney) from RB_Sell_Achievements_Details r where {where}";
@@ -249,8 +288,6 @@ GROUP BY PeriodId ";
             return obj == null ? 0 : Convert.ToDecimal(obj);
         }
 
-
-
         /// <summary>
         /// 获取销售提成根据用户id
         /// </summary>
@@ -292,6 +329,14 @@ GROUP BY PeriodId ";
             {
                 where += $@" and DATE_FORMAT(STR_TO_DATE(CONCAT(p.Periods,'-01'),'%Y-%m-%d'),'%Y-%m-%d')>=DATE_FORMAT('{demodel.PeriodsTime}','%Y-%m-%d')";
             }
+            if (demodel.UserType > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.UserType)} ={demodel.UserType}";
+            }
+            if (demodel.IsDept > 0)
+            {
+                where += $@" and r.{nameof(RB_Sell_Achievements_Details_ViewModel.IsDept)} ={demodel.IsDept}";
+            }
 
             string sql = $@" SELECT
 	r.*, p.Periods AS PeriodsTime

Edu.WebApi/Controllers/Third/ThirdController.cs

@@ -29,6 +29,10 @@ namespace Edu.WebApi.Controllers.Third
         /// 订单处理类
         /// </summary>
         private readonly OrderModule orderModule = new OrderModule();
+        /// <summary>
+        /// 业绩提成
+        /// </summary>
+        private readonly SellAchievementsModule sellAchievementsModule = new SellAchievementsModule();
 
         /// <summary>
         /// 根部部门层级获取部门主管
@@ -155,6 +159,10 @@ namespace Edu.WebApi.Controllers.Third
             bool flag = orderModule.UpdateEduOrderIncome(OrderId, Income, PlatformTax, Refund, empModel);
             if (flag)
             {
+                if (Refund > 0) {
+                    //是退款 检验订单是否会影响 业绩提成
+                    System.Threading.Tasks.Task.Run(() => sellAchievementsModule.ValidataAchievements(OrderId));
+                }
                 return ApiResult.Success();
             }
             else