1

Edu.Model/ViewModel/User/RB_User_ReturnComission_ViewModel.cs

@@ -7,5 +7,6 @@ namespace Edu.Model.ViewModel.User
 {
     public class RB_User_ReturnComission_ViewModel : RB_User_ReturnCommission
     {
+
     }
 }

Edu.Module.Customer/CustomerCommissionModule.cs

@@ -259,10 +259,26 @@ namespace Edu.Module.Course
         {
             return order_ReturnComissionRepository.GetCommissionStatistics(dmodel);
         }
-        #endregion
-
-        #region 返佣存折查询
 
+        /// <summary>
+        /// 获取返佣/存折统计
+        /// </summary>
+        /// <param name="orderSourceType"></param>
+        /// <param name="orderSourceId"></param>
+        /// <param name="commissionType"></param>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public object GetCustomerCommissionStat(int orderSourceType, int orderSourceId, int commissionType, UserInfo userInfo)
+        {
+            var model = user_ReturnComissionRepository.GetCustomerCommissionStat(userInfo.Group_Id, orderSourceType, orderSourceId, commissionType);
+            return new
+            {
+                model?.UnSettlementMoney,
+                model?.SttlementMoney,
+                model?.CashOutMoney,
+                model?.CanCashOutMoney
+            };
+        }
         #endregion
     }
 }

Edu.Module.Customer/CustomerRemitModule.cs

@@ -20,10 +20,6 @@ namespace Edu.Module.Customer
     /// </summary>
     public class CustomerRemitModule
     {
-        /// <summary>
-        /// 客户幸福存折和返佣仓储层对象
-        /// </summary>
-        private readonly RB_Customer_BalanceDetailRepository customer_BalanceDetailRepository = new RB_Customer_BalanceDetailRepository();
         /// <summary>
         /// 同业
         /// </summary>
@@ -48,7 +44,14 @@ namespace Edu.Module.Customer
         /// 幻灯片
         /// </summary>
         private readonly RB_B2B_SlideShowRepository b2B_SlideShowRepository = new RB_B2B_SlideShowRepository();
-
+        /// <summary>
+        /// 用户返佣
+        /// </summary>
+        private readonly Repository.User.RB_User_ReturnComissionRepository user_ReturnComissionRepository = new Repository.User.RB_User_ReturnComissionRepository();
+        /// <summary>
+        /// 订单返佣
+        /// </summary>
+        private readonly Repository.Sell.RB_Order_ReturnComissionRepository order_ReturnComissionRepository = new Repository.Sell.RB_Order_ReturnComissionRepository();
 
 
         #region 提现管理
@@ -269,10 +272,36 @@ namespace Edu.Module.Customer
                     }
                     #endregion
                 }
-                else if (state == 2) { 
-                    //驳回的话 需要修改已提现状态  不过要改成课耗返佣  暂不处理
-
-
+                else if (state == 2) {
+                    //驳回的话 需要修改已提现状态 
+                    var urmodel = user_ReturnComissionRepository.GetList(new Model.ViewModel.User.RB_User_ReturnComission_ViewModel() { GroupId = userInfo.Group_Id, UserId = rmodel.CustomerId, UserType = Common.Enum.User.StuCreateTypeEnum.CustomerInput, CommissionType = rmodel.Type }).FirstOrDefault();
+                    if (urmodel != null)
+                    {
+                        Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
+                            { nameof(Model.ViewModel.User.RB_User_ReturnComission_ViewModel.CanCashOutMoney), urmodel.CanCashOutMoney + rmodel.AppliedMoney},
+                            { nameof(Model.ViewModel.User.RB_User_ReturnComission_ViewModel.CashOutMoney), urmodel.CashOutMoney - rmodel.AppliedMoney}
+                        };
+                        List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                            new WhereHelper(){
+                                 FiledName = nameof(Model.ViewModel.User.RB_User_ReturnComission_ViewModel.UserId),
+                                  FiledValue = urmodel.UserId,
+                                   OperatorEnum =OperatorEnum.Equal
+                            },
+                            new WhereHelper(){
+                                 FiledName = nameof(Model.ViewModel.User.RB_User_ReturnComission_ViewModel.UserType),
+                                  FiledValue = urmodel.UserType,
+                                   OperatorEnum =OperatorEnum.Equal
+                            },
+                            new WhereHelper(){
+                                 FiledName = nameof(Model.ViewModel.User.RB_User_ReturnComission_ViewModel.CommissionType),
+                                  FiledValue = urmodel.CommissionType,
+                                   OperatorEnum =OperatorEnum.Equal
+                            },
+                        };
+                        user_ReturnComissionRepository.Update(keyValues1, wheres1);
+                        //更新所有订单返佣为可提现
+                        order_ReturnComissionRepository.UpdateOrderReturnComission(userInfo.Group_Id, remitId);
+                    }
                 }
             }
             return flag ? "" : "出错了，请联系管理员";

Edu.Repository/Sell/RB_Order_ReturnComissionRepository.cs

@@ -106,6 +106,10 @@ namespace Edu.Repository.Sell
             {
                 where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.OrderSourceId)} ={demodel.OrderSourceId}";
             }
+            if (demodel.UnionCashOutId > 0)
+            {
+                where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.UnionCashOutId)} ={demodel.UnionCashOutId}";
+            }
             if (demodel.Q_SelectNormal == 1)
             {
                 where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.Status)} in(0,1,2)";
@@ -169,7 +173,10 @@ where {where} order by r.Id desc";
             {
                 where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.Status)} in(0,1,2)";
             }
-
+            else if (demodel.Q_SelectNormal == 2)
+            {
+                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";
@@ -221,6 +228,10 @@ from RB_Order_ReturnComission r where {where} group by r.OrderSourceType,r.Order
             {
                 where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.OrderSourceId)} ={demodel.OrderSourceId}";
             }
+            if (demodel.UnionCashOutId > 0)
+            {
+                where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.UnionCashOutId)} ={demodel.UnionCashOutId}";
+            }
             if (demodel.Q_SelectNormal == 1)
             {
                 where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.Status)} in(0,1,2)";
@@ -237,5 +248,17 @@ where {where}";
             var obj = ExecuteScalar(sql);
             return obj == null ? 0 : Convert.ToDecimal(obj);
         }
+
+        /// <summary>
+        /// 更新已提现状态为可提现
+        /// </summary>
+        /// <param name="group_Id"></param>
+        /// <param name="remitId"></param>
+        public void UpdateOrderReturnComission(int group_Id, int remitId)
+        {
+            string sql = $@"update RB_Order_ReturnComission r set r.Status =1
+where r.GroupId ={group_Id} and r.UnionCashOutId ={remitId}";
+            Execute(sql);
+        }
     }
 }

Edu.Repository/Sell/RB_ReturnMoney_BatchRepository.cs

@@ -24,7 +24,7 @@ namespace Edu.Repository.Sell
         /// <returns></returns>
         public List<RB_ReturnMoney_Batch_ViewModel> GetPageList(int pageIndex, int pageSize, out long count, int type, string month, int groupId)
         {
-            string sql = "select a.Id,a.BatchName,TotalMoney,a.CreateBy,DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%S') as CreateDateStr";
+            string sql = "select a.Id,a.BatchName,TotalMoney,a.CreateBy,a.CreateDate,DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%S') as CreateDateStr";
             sql += " from RB_ReturnMoney_Batch a";
             sql += " where a.GroupId=@gid";
             DynamicParameters parameters = new DynamicParameters();

Edu.Repository/User/RB_User_ReturnComissionRepository.cs

@@ -43,5 +43,52 @@ sum(CanCashOutMoney)as CanCashOutMoney
 from RB_User_ReturnCommission where GroupId ={group_Id} and UserId={id} and UserType in(1,3)";
             return Get<RB_User_ReturnComission_ViewModel>(sql).FirstOrDefault();
         }
+
+        /// <summary>
+        /// 获取同行返佣/存折统计
+        /// </summary>
+        /// <param name="group_Id"></param>
+        /// <param name="orderSourceType"></param>
+        /// <param name="orderSourceId"></param>
+        /// <param name="commissionType"></param>
+        /// <returns></returns>
+        public RB_User_ReturnComission_ViewModel GetCustomerCommissionStat(int group_Id, int orderSourceType, int orderSourceId, int commissionType)
+        {
+            string sql = $@"select sum(UnSettlementMoney)as UnSettlementMoney,
+sum(SttlementMoney)as SttlementMoney,
+sum(CashOutMoney)as CashOutMoney,
+sum(CanCashOutMoney)as CanCashOutMoney 
+from RB_User_ReturnCommission where GroupId ={group_Id} and UserId={orderSourceId} and UserType ={orderSourceType} and CommissionType ={commissionType}";
+            return Get<RB_User_ReturnComission_ViewModel>(sql).FirstOrDefault();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_User_ReturnComission_ViewModel> GetList(RB_User_ReturnComission_ViewModel dmodel)
+        {
+            string where = $@" 1=1";
+            if (dmodel.GroupId > 0)
+            {
+                where += $@" {nameof(RB_User_ReturnComission_ViewModel.GroupId)} ={dmodel.GroupId}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" {nameof(RB_User_ReturnComission_ViewModel.UserId)} ={dmodel.UserId}";
+            }
+            if (dmodel.UserType > 0)
+            {
+                where += $@" {nameof(RB_User_ReturnComission_ViewModel.UserType)} ={(int)dmodel.UserType}";
+            }
+            if (dmodel.CommissionType > 0)
+            {
+                where += $@" {nameof(RB_User_ReturnComission_ViewModel.CommissionType)} ={dmodel.CommissionType}";
+            }
+
+            string sql = $@"select * from RB_User_ReturnCommission where {where}";
+            return Get<RB_User_ReturnComission_ViewModel>(sql).ToList();
+        }
     }
 }

Edu.WebApi/Controllers/Customer/CustomerCommissionController.cs

@@ -263,8 +263,17 @@ namespace Edu.WebApi.Controllers.Course
         /// <returns></returns>
         [HttpPost]
         public ApiResult GetCustomerCommissionStat() {
+            var userInfo = base.UserInfo;
+            JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
+            int OrderSourceType = parms.GetInt("OrderSourceType", 1);//来源
+            int OrderSourceId = parms.GetInt("OrderSourceId", 0);//来源对应ID (内部  同行  学生)
+            int CommissionType = parms.GetInt("CommissionType", 0);//类型
+            if (OrderSourceType <= 0 || OrderSourceId <= 0 || CommissionType <= 0) {
+                return ApiResult.ParamIsNull();
+            }
 
-            return ApiResult.Success();
+            var Robj = customerCommissionModule.GetCustomerCommissionStat(OrderSourceType, OrderSourceId, CommissionType, userInfo);
+            return ApiResult.Success("", Robj);
         }
 
         #endregion