1

Mall.Model/Entity/Product/RB_Goods_Proxy.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品代理信息表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Proxy
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 原商品id
+        /// </summary>        
+        public int? GoodsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 原商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 原小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 代理商品id
+        /// </summary>        
+        public int? ProxyGoodsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 代理商户
+        /// </summary>        
+        public int ProxyTenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 代理小程序id
+        /// </summary>        
+        public int ProxyMallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 删除状态  0正常
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 描述
+        /// </summary>        
+        public string Remark
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Extend/Product/RB_Goods_Proxy_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品代理表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_Proxy_Extend : RB_Goods_Proxy
+    {
+        
+    }
+}

Mall.Module.Product/ProductModule.cs

@@ -3936,7 +3936,7 @@ namespace Mall.Module.Product
                         Id = 0
                     });
                     string zdgradeStr = string.Join(",", dgradeList.Select(x => x.Id).OrderBy(x => x));
-                    string ndgradeStr = string.Join(",", model.DistributionCommissionList.Select(x => x.DistributorGrade).OrderBy(x => x));
+                    string ndgradeStr = string.Join(",", model.DistributionCommissionList.Select(x => x.DistributorGrade).Distinct().OrderBy(x => x));
                     var KeyList = model.DistributionCommissionList.Select(x => x.SpecificationSort ?? "").Distinct().ToList();
                     if (zdgradeStr == ndgradeStr)
                     {
@@ -4046,7 +4046,7 @@ namespace Mall.Module.Product
                     var mgradeList = member_GradeRepository.GetList(new RB_Member_Grade_Extend() { Enabled = 1, TenantId = 1, MallBaseId = 1 });
 
                     string zdgradeStr = string.Join(",", mgradeList.Select(x => x.Id).OrderBy(x => x));
-                    string ndgradeStr = string.Join(",", model.MemberPriceList.Select(x => x.MemberGrade).OrderBy(x => x));
+                    string ndgradeStr = string.Join(",", model.MemberPriceList.Select(x => x.MemberGrade).Distinct().OrderBy(x => x));
                     if (zdgradeStr == ndgradeStr)
                     {
                         var KeyList = model.MemberPriceList.Select(x => x.SpecificationSort ?? "").Distinct().ToList();
@@ -4085,7 +4085,8 @@ namespace Mall.Module.Product
                         foreach (var qitem in KeyList)
                         {
                             var treemodel = model.MemberPriceList.Where(x => (x.SpecificationSort ?? "") == qitem).FirstOrDefault();
-                            treemodel.GradePriceList = model.MemberPriceList.Where(x => (x.SpecificationSort ?? "") == qitem).ToList();
+                            //treemodel.GradePriceList = model.MemberPriceList.Where(x => (x.SpecificationSort ?? "") == qitem).ToList();
+                            treemodel.GradePriceList = new List<RB_Goods_MemberPrice_Extend>() { };
                             var gradePrice = model.MemberPriceList.Where(x => (x.SpecificationSort ?? "") == qitem).ToList();
                             mgradeList = mgradeList.OrderByDescending(x => x.Grade).ToList();
                             foreach (var grade in mgradeList)

Mall.Module.User/UserModule.cs

@@ -1557,6 +1557,12 @@ namespace Mall.Module.User
                                 }
                             };
                             member_UserRepository.Update(keyValues1, wheres1, trans);
+
+                            var umodel = GetMemberUserInfo(item.UserId ?? 0);
+                            if (umodel != null)
+                            {
+                                new MiniProgramMsgModule().SendAuditResultMsg(item.TenantId, item.MallBaseId, umodel.OpenId, "分销商审核已通过", "通过", umodel.Name, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                            }
                         }
                     }
                 }
@@ -1955,7 +1961,27 @@ namespace Mall.Module.User
                             OperatorEnum=OperatorEnum.Equal
                     }
                 };
-                distributor_RemitRepository.Update(keyValues, wheres);
+                bool flag = distributor_RemitRepository.Update(keyValues, wheres);
+                if (flag) {
+                    //拒绝之后  需回滚提现佣金
+                    var remodel = distributor_RemitRepository.GetEntity(remitId);
+                    var dmodel = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { UserId = remodel.UserId, TenantId = Convert.ToInt32(uid), MallBaseId = mallBaseId }).FirstOrDefault();
+                    if (dmodel != null)
+                    {
+                        Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
+                            { nameof(RB_Distributor_Info.CommissionWithdrawal), (dmodel.CommissionWithdrawal ?? 0) + (remodel.AppliedMoney??0)}
+                        };
+                        List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                            new WhereHelper(){
+                                 FiledName=nameof(RB_Distributor_Info.Id),
+                                  FiledValue=dmodel.Id,
+                                   OperatorEnum=OperatorEnum.Equal
+                            }
+                        };
+                        distributor_InfoRepository.Update(keyValues1, wheres1);
+                    }
+
+                }
             }
             else
             {

Mall.WebApi/Controllers/User/UserController.cs

@@ -1872,6 +1872,10 @@ namespace Mall.WebApi.Controllers.User
             string msg = userModule.SetDistributorRemitAudit(RemitId, Type, Remark, re.uid, re.MallBaseId);
             if (msg == "")
             {
+                if (Type == 3) {
+                    var umodel = userModule.GetMemberUserInfo(model.UserId ?? 0);
+                    new MiniProgramMsgModule().SendWithdrawFailMsg(model.TenantId, model.MallBaseId, umodel.OpenId, (model.RemitMoney ?? 0).ToString(), "提现申请已被拒绝");
+                }
                 return ApiResult.Success();
             }
             else