1

Edu.Module.Course/EduB2BOrderModule.cs

@@ -103,7 +103,11 @@ namespace Edu.Module.Course
                     if (blist.Any())
                     {
                         var clist = customerRepository.GetCustomerListRepository(new RB_Customer_Extend() { Group_Id = GroupId, CustomerIds = string.Join(",", blist.Select(x => x.CustomerId).Distinct()) });
-                        var olist = orderRepository.GetEduB2BOrderCanSendCommissionList(GroupId, dateStr);
+                        var olist = orderRepository.GetOrderListRepository(new RB_Order_ViewModel() { Group_Id = GroupId, QOrderIds = string.Join(",", blist.Select(x => x.OrderId).Distinct()) });
+                        //查询需要课耗返的订单  在查询其课耗信息
+                        //再查询学生信息
+
+
                         //查询所有的同业
                         foreach (var item in olist.OrderBy(x => x.OrderId))
                         {
@@ -113,12 +117,30 @@ namespace Edu.Module.Course
                                 foreach (var qitem in bclist.OrderBy(x => x.Id))
                                 {
                                     var cmodel = clist.Where(x => x.CustomerId == qitem.CustomerId).FirstOrDefault();
+                                    if (item.CommissionReType == 1)
+                                    {
+                                        //课耗返佣
+
+                                    }
+                                    else if (item.CommissionReType == 2)
+                                    {
+                                        Dictionary<string, object> keyValues = new Dictionary<string, object>();
+                                        if (qitem.RebateType == 1)
+                                        {
+                                            //返佣                                            
                                             cmodel.TotalCommission += qitem.Money;
                                             cmodel.CommissionWithdrawal += qitem.Money;
-                                    Dictionary<string, object> keyValues = new Dictionary<string, object>() {
-                                        { nameof(RB_Customer_BalanceDetail_ViewModel.BalanceState), 1},
-                                        { nameof(RB_Customer_BalanceDetail_ViewModel.AccountMoney), cmodel.CommissionWithdrawal },
-                                    };
+                                            keyValues.Add(nameof(RB_Customer_BalanceDetail_ViewModel.BalanceState), 1);
+                                            keyValues.Add(nameof(RB_Customer_BalanceDetail_ViewModel.GiveOutMoney), qitem.Money);
+                                            keyValues.Add(nameof(RB_Customer_BalanceDetail_ViewModel.AccountMoney), cmodel.CommissionWithdrawal);
+                                        }
+                                        else {
+                                            //幸福存折
+                                            cmodel.Client_Balance += qitem.Money;
+                                            keyValues.Add(nameof(RB_Customer_BalanceDetail_ViewModel.BalanceState), 1);
+                                            keyValues.Add(nameof(RB_Customer_BalanceDetail_ViewModel.GiveOutMoney), qitem.Money);
+                                            keyValues.Add(nameof(RB_Customer_BalanceDetail_ViewModel.AccountMoney), cmodel.Client_Balance);
+                                        }
                                         List<WhereHelper> wheres = new List<WhereHelper>() {
                                             new WhereHelper(){
                                                     FiledName = nameof(RB_Customer_BalanceDetail_ViewModel.Id),
@@ -130,6 +152,7 @@ namespace Edu.Module.Course
                                     }
                                 }
                             }
+                        }
                         //更新所有的同业佣金
                         foreach (var item in clist)
                         {
@@ -148,6 +171,7 @@ namespace Edu.Module.Course
                         }
                     }
                 }
+                //(后面应该调整为  单同行遍历更新  不然课耗订单太多  效率肯定非常的慢-------------)
                 customerRepository.DBSession.Commit();
                 return true;
             }

Edu.Repository/Customer/RB_Customer_BalanceDetailRepository.cs

@@ -130,7 +130,7 @@ WHERE 1=1
         {
             string sql = $@"SELECT b.* FROM rb_order o
 INNER JOIN rb_customer_balancedetail b on o.OrderId = b.OrderId
-WHERE o.Group_Id ={groupId} and o.OrderState =1 and o.OrderSource =9 and o.PayState =1 and b.RebateType =1 and b.BalanceType =1 and b.BalanceState =2 and o.PayDate <='{dateStr} 23:59:59' ";
+WHERE o.Group_Id ={groupId} and o.OrderState =1 and o.CustomerId >0 and o.PreferPrice = (o.Income - o.Refund + o.PlatformTax + o.DiscountMoney) and b.BalanceType =1 and b.BalanceState in(2,3) and o.CreateTime <='{dateStr} 23:59:59' ";
             return Get<RB_Customer_BalanceDetail_ViewModel>(sql).ToList();
         }