修改分销商可提现佣金

Mall.Model/Entity/User/RB_Distributor_Log.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 分销商修改日志信息表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Distributor_Log
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 用户id/分销商id
+        /// </summary>        
+        public int? UserId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 类型   1修改佣金
+        /// </summary>        
+        public int? Type
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 操作内容
+        /// </summary>        
+        public string Content
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 操作员工
+        /// </summary>
+        public int? EmpId { get; set; }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Module.User/UserModule.cs

@@ -149,6 +149,10 @@ namespace Mall.Module.User
         /// 粉象返佣金额
         /// </summary>
         private RB_Distributor_FXCommissionRepository distributor_FXCommissionRepository = new RB_Distributor_FXCommissionRepository();
+        /// <summary>
+        /// 分销商日志
+        /// </summary>
+        private RB_Distributor_LogRepository distributor_LogRepository = new RB_Distributor_LogRepository();
 
 
 
@@ -1613,7 +1617,7 @@ namespace Mall.Module.User
         /// <param name="uid"></param>
         /// <param name="mallBaseId"></param>
         /// <returns></returns>
-        public string SetDistributorAudit(string userIds, int type, int newGradeId, string remark, string uid, int mallBaseId)
+        public string SetDistributorAudit(string userIds, int type, int newGradeId, string remark, string uid, int mallBaseId,int empId)
         {
             var trans = distributor_InfoRepository.DbTransaction;
             try
@@ -1771,6 +1775,20 @@ namespace Mall.Module.User
                             }
                         };
                         bool flag = distributor_InfoRepository.Update(keyValues, wheres, trans);
+                        if (flag) {
+                            //记录日志
+                            distributor_LogRepository.Insert(new RB_Distributor_Log()
+                            {
+                                Content = "修改分销商等级为：newGradeId",
+                                CreateDate = DateTime.Now,
+                                EmpId = empId,
+                                Id = 0,
+                                MallBaseId = mallBaseId,
+                                TenantId = Convert.ToInt32(uid),
+                                Type = 1,
+                                UserId = item.Id
+                            });
+                        }
                     }
                 }
                 else if (type == 5)
@@ -1914,6 +1932,21 @@ namespace Mall.Module.User
                             }
                         };
                         bool flag = distributor_InfoRepository.Update(keyValues, wheres, trans);
+                        if (flag)
+                        {
+                            //记录日志
+                            distributor_LogRepository.Insert(new RB_Distributor_Log()
+                            {
+                                Content = "修改分销商等级为：newGradeId",
+                                CreateDate = DateTime.Now,
+                                EmpId = empId,
+                                Id = 0,
+                                MallBaseId = mallBaseId,
+                                TenantId = Convert.ToInt32(uid),
+                                Type = 1,
+                                UserId = item.Id
+                            });
+                        }
                     }
                 }
                 else
@@ -2431,6 +2464,45 @@ namespace Mall.Module.User
             return flag ? "" : "操作失败";
         }
 
+        /// <summary>
+        /// 后台修改分销商可提现佣金
+        /// </summary>
+        /// <param name="distributorId"></param>
+        /// <param name="money"></param>
+        /// <param name="uid"></param>
+        /// <param name="mallBaseId"></param>
+        /// <param name="empId"></param>
+        /// <returns></returns>
+        public bool SetDistributorCommission(int distributorId, decimal money, string uid, int mallBaseId, int empId)
+        {
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                { nameof(RB_Distributor_Info.CommissionWithdrawal),money}
+            };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                     FiledName=nameof(RB_Distributor_Info.Id),
+                      FiledValue=distributorId,
+                       OperatorEnum=OperatorEnum.Equal
+                }
+            };
+            bool flag = distributor_InfoRepository.Update(keyValues, wheres);
+            if (flag) {
+                //记录日志
+                distributor_LogRepository.Insert(new RB_Distributor_Log()
+                {
+                    Content = "修改分销商佣金为：" + money,
+                    CreateDate = DateTime.Now,
+                    EmpId = empId,
+                    Id = 0,
+                    MallBaseId = mallBaseId,
+                    TenantId = Convert.ToInt32(uid),
+                    Type = 1,
+                    UserId = distributorId
+                });
+            }
+            return flag;
+        }
+
         #endregion
 
         #region 收货地址

Mall.Repository/User/RB_Distributor_LogRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System.Linq;
+
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 分销商日志仓储层
+    /// </summary>
+    public class RB_Distributor_LogRepository : RepositoryBase<RB_Distributor_Log>
+    {
+
+    }
+}

Mall.WebApi/Controllers/User/UserController.cs

@@ -1575,7 +1575,7 @@ namespace Mall.WebApi.Controllers.User
                 }
             }
 
-            string msg = userModule.SetDistributorAudit(UserIds, Type, NewGradeId, Remark, re.uid, re.MallBaseId);
+            string msg = userModule.SetDistributorAudit(UserIds, Type, NewGradeId, Remark, re.uid, re.MallBaseId, re.EmpId);
             if (msg == "")
             {
                 return ApiResult.Success();
@@ -1707,6 +1707,35 @@ namespace Mall.WebApi.Controllers.User
 
         }
 
+        /// <summary>
+        /// 设置分销商佣金
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetDistributorCommission() 
+        {
+            var re = RequestParm;
+            var parms = JObject.Parse(re.msg.ToString());
+            int DistributorId = parms.GetInt("DistributorId", 0);
+            decimal Money = parms.GetDecimal("Money");
+            if (DistributorId <= 0) {
+                return ApiResult.ParamIsNull();
+            }
+            if (Money < 0) {
+                return ApiResult.ParamIsNull();
+            }
+
+            bool flag = userModule.SetDistributorCommission(DistributorId, Money, re.uid, re.MallBaseId, re.EmpId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
         #endregion
 
         #region 分销商提现