1

Edu.Model/ViewModel/Sell/RB_Order_ViewModel.cs

@@ -340,5 +340,9 @@ namespace Edu.Model.ViewModel.Sell
         /// </summary>
         public int CategoryId { get; set; }
 
+        /// <summary>
+        /// 返佣总金额 （rb_order_returncomission）
+        /// </summary>
+        public decimal BrokerageMoney { get; set; }
     }
 }
\ No newline at end of file

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -438,10 +438,12 @@ SELECT SUM(CASE WHEN o.OrderState <> 3 THEN o.PreferPrice ELSE 0 END) AS PreferP
        SUM(CASE WHEN o.OrderState = 3 THEN o.GuestNum ELSE 0 END) AS CancelNum,
        SUM(CASE WHEN ea.GiveOutMoney > 0 THEN ea.GiveOutMoney ELSE 
 CASE WHEN o.CommissionMoney <> -1 AND o.OrderState <> 3 THEN o.CommissionMoney ELSE 0 END END) AS CommissionMoney,
-       SUM(CASE WHEN o.OrderState <> 3 THEN o.ExtraRewardMoney - o.ExtraDeductMoney ELSE 0 END) AS ExtraRewardMoney
+       SUM(CASE WHEN o.OrderState <> 3 THEN o.ExtraRewardMoney - o.ExtraDeductMoney ELSE 0 END) AS ExtraRewardMoney,
+       sum(IFNULL(orc.BrokerageMoney,0)) as BrokerageMoney
 FROM RB_Order o LEFT JOIN rb_class c on o.ClassId = c.ClassId
      LEFT JOIN rb_course AS course ON (o.CourseId=course.CourseId AND o.CourseId>0 AND o.OrderType=1) 
      LEFT JOIN (SELECT em.OrderId,SUM(em.GiveOutMoney) as GiveOutMoney FROM rb_sell_achievements_emp em GROUP BY em.OrderId) ea on ea.OrderId = o.OrderId
+left join (select rc.OrderId,sum(rc.CommissionMoeny) as BrokerageMoney from rb_order_returncomission rc where rc.Status >=0 group by rc.OrderId ) orc on orc.OrderId = o.OrderId
      LEFT JOIN rb_customer AS cus ON O.CustomerId=cus.CustomerId
 WHERE {where}
 ";
@@ -633,9 +635,11 @@ SELECT SUM(CASE WHEN o.OrderState <> 3 THEN o.PreferPrice ELSE 0 END) AS PreferP
        SUM(CASE WHEN o.OrderState = 3 THEN o.GuestNum ELSE 0 END) AS CancelNum,
        SUM(CASE WHEN ea.GiveOutMoney > 0 THEN ea.GiveOutMoney ELSE 
 CASE WHEN o.CommissionMoney <> -1 AND o.OrderState <> 3 THEN o.CommissionMoney ELSE 0 END END) AS CommissionMoney,
-       SUM(CASE WHEN o.OrderState <> 3 THEN o.ExtraRewardMoney - o.ExtraDeductMoney ELSE 0 END) AS ExtraRewardMoney
+       SUM(CASE WHEN o.OrderState <> 3 THEN o.ExtraRewardMoney - o.ExtraDeductMoney ELSE 0 END) AS ExtraRewardMoney,
+       sum(IFNULL(orc.BrokerageMoney,0)) as BrokerageMoney
 FROM RB_Order o left join rb_studyabroad c on o.SourceId = c.Id
 LEFT JOIN (SELECT em.OrderId,SUM(em.GiveOutMoney) as GiveOutMoney FROM rb_sell_achievements_emp em GROUP BY em.OrderId) ea on ea.OrderId = o.OrderId
+left join (select rc.OrderId,sum(rc.CommissionMoeny) as BrokerageMoney from rb_order_returncomission rc where rc.Status >=0 group by rc.OrderId ) orc on orc.OrderId = o.OrderId
 WHERE {where}
 ";
             return Get<RB_Order_ViewModel>(sql).FirstOrDefault();

Edu.Repository/Sell/RB_Order_ReturnComissionRepository.cs

@@ -190,6 +190,10 @@ where {where} order by r.Id desc";
             {
                 where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.OrderId)} ={demodel.OrderId}";
             }
+            if (!string.IsNullOrEmpty(demodel.QOrderIds))
+            {
+                where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.OrderId)} in({demodel.QOrderIds})";
+            }
             if (demodel.OrderSourceType > 0)
             {
                 where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.OrderSourceType)} ={(int)demodel.OrderSourceType}";

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -269,6 +269,7 @@ namespace Edu.WebApi.Controllers.Course
                         x.CustomerName,
                         x.CustomerTel,
                         x.ClassScrollType,
+                        x.BrokerageMoney,
                         SplitDetailsList = x?.SplitDetailsList?.Select(qitem => new
                         {
                             qitem.S_ClassId,
@@ -380,6 +381,7 @@ namespace Edu.WebApi.Controllers.Course
                         x.CustomerName,
                         x.CustomerTel,
                         x.ClassScrollType,
+                        x.BrokerageMoney,
                         SaleRemarkList = x.SaleRemarkList.Select(z => new
                         {
                             z.Id,
@@ -1379,7 +1381,8 @@ namespace Edu.WebApi.Controllers.Course
                     GuestNum = orderS?.GuestNum ?? 0,
                     CancelNum = orderS?.CancelNum ?? 0,
                     CommissionMoney = orderS?.CommissionMoney ?? 0,
-                    ExtraRewardMoney = orderS?.ExtraRewardMoney ?? 0
+                    ExtraRewardMoney = orderS?.ExtraRewardMoney ?? 0,
+                    BrokerageMoney = orderS?.BrokerageMoney ?? 0
                 },
                 List = orderList?.Select(x => new
                 {
@@ -1525,6 +1528,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.CreateType,
                     CreateTypeName = x.CreateType.ToName(),
                     x.StuSourceIdName,
+                    x.BrokerageMoney
                 })
             };
             pageModel.PageData = obj;
@@ -1577,7 +1581,8 @@ namespace Edu.WebApi.Controllers.Course
                     GuestNum = orderS?.GuestNum ?? 0,
                     CancelNum = orderS?.CancelNum ?? 0,
                     CommissionMoney = (orderS?.CommissionMoney ?? 0) > 0 ? (orderS?.CommissionMoney ?? 0) : 0,
-                    ExtraRewardMoney = orderS?.ExtraRewardMoney ?? 0
+                    ExtraRewardMoney = orderS?.ExtraRewardMoney ?? 0,
+                    BrokerageMoney = orderS?.BrokerageMoney ?? 0
                 },
                 List = orderList?.Select(x => new
                 {
@@ -1723,6 +1728,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.CreateType,
                     CreateTypeName = x.CreateType.ToName(),
                     x.StuSourceIdName,
+                    x.BrokerageMoney
                 })
             };
             pageModel.PageData = obj;
@@ -1946,7 +1952,8 @@ namespace Edu.WebApi.Controllers.Course
                     GuestNum = orderS?.GuestNum ?? 0,
                     CancelNum = orderS?.CancelNum ?? 0,
                     CommissionMoney = orderS?.CommissionMoney ?? 0,
-                    ExtraRewardMoney = orderS?.ExtraRewardMoney ?? 0
+                    ExtraRewardMoney = orderS?.ExtraRewardMoney ?? 0,
+                    BrokerageMoney = orderS?.BrokerageMoney ?? 0
                 },
                 List = orderList.Select(x => new
                 {
@@ -1996,6 +2003,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.LXConfirmState,
                     x.LXConfirmDate,
                     x.LXConfirmEmpId,
+                    x.BrokerageMoney,
                     SaleRemarkList = x.SaleRemarkList.Select(z => new
                     {
                         z.Id,
@@ -2072,7 +2080,8 @@ namespace Edu.WebApi.Controllers.Course
                     GuestNum = orderS?.GuestNum ?? 0,
                     CancelNum = orderS?.CancelNum ?? 0,
                     CommissionMoney = orderS?.CommissionMoney ?? 0,
-                    ExtraRewardMoney = orderS?.ExtraRewardMoney ?? 0
+                    ExtraRewardMoney = orderS?.ExtraRewardMoney ?? 0,
+                    BrokerageMoney = orderS?.BrokerageMoney ?? 0
                 },
                 List = orderList.Select(x => new
                 {
@@ -2125,6 +2134,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.LXConfirmDate,
                     x.LXConfirmEmpId,
                     x.LXConfirmState,
+                    x.BrokerageMoney,
                     SaleRemarkList = x.SaleRemarkList.Select(z => new
                     {
                         z.Id,