分销等级

Mall.Model/Extend/Product/RB_Goods_OrderCommission_Extend.cs

@@ -34,6 +34,10 @@ namespace Mall.Model.Extend.Product
         /// </summary>
         public string Mobile { get; set; }
         /// <summary>
+        /// 等级描述
+        /// </summary>
+        public string GradeDescription { get; set; }
+        /// <summary>
         /// 分销订单查询状态  0全部  1代付款  2已付款  3已完成
         /// </summary>
         public int? DistrbutionOrderSelectStatus { get; set; }

Mall.Module.Product/OrderModule.cs

@@ -181,6 +181,10 @@ namespace Mall.Module.Product
         /// 和平返佣比例
         /// </summary>
         private readonly RB_Distributor_HPGradeRatioRepository distributor_HPGradeRatioRepository = new RB_Distributor_HPGradeRatioRepository();
+        /// <summary>
+        /// 和平等级
+        /// </summary>
+        private readonly RB_Distributor_HPGradeInfoRepository distributor_HPGradeInfoRepository = new RB_Distributor_HPGradeInfoRepository();
 
 
         #region 购物车
@@ -2613,7 +2617,7 @@ namespace Mall.Module.Product
                                         Commission = OneCommission,
                                         CommissionState = 1,
                                         CreateDate = DateTime.Now,
-                                        Grade = disModel.GradeId,
+                                        Grade = disModel.HPGradeId,
                                         IsGoodsDistribution = 2,
                                         MallBaseId = demodel.MallBaseId,
                                         OrderDetailId = item.Id,
@@ -2665,7 +2669,7 @@ namespace Mall.Module.Product
                                                 Commission = OneCommission1,
                                                 CommissionState = 1,
                                                 CreateDate = DateTime.Now,
-                                                Grade = disModel1.GradeId,
+                                                Grade = disModel1.HPGradeId,
                                                 IsGoodsDistribution = 2,
                                                 MallBaseId = demodel.MallBaseId,
                                                 OrderDetailId = item.Id,
@@ -3745,11 +3749,36 @@ namespace Mall.Module.Product
                     var ulist = member_UserRepository.GetList(new RB_Member_User_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, UserIds = string.Join(",", oclist.Select(x => x.UserId).Distinct()) });
                     //获取分销商
                     var dislist = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, UserIds = string.Join(",", oclist.Select(x => x.UserId).Distinct()) });
+                    var HpgradeList = new List<RB_Distributor_HPGradeInfo_Extend>();
+                    if (oclist.Where(x => x.Type == 2).Any()) {
+                        string gradeIds = string.Join(",", oclist.Where(x => x.Type == 2).Select(x => x.Grade).Distinct());
+                        HpgradeList = distributor_HPGradeInfoRepository.GetList(new RB_Distributor_HPGradeInfo_Extend() { GradeIds = gradeIds, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }, true);
+                    }
                     foreach (var item in oclist) {
                         var umodel = ulist.Where(x => x.Id == item.UserId).FirstOrDefault();
                         item.UserName = umodel?.Name ?? "";
                         item.Mobile = umodel?.Moblie ?? "";
                         item.Name = dislist.Where(x => x.UserId == item.UserId).FirstOrDefault()?.Name ?? "";
+                        if (item.Type == 1) {
+                            if (item.Grade == 0)
+                            {
+                                item.GradeDescription = "自购返利";
+                            }
+                            else if (item.Grade == 1) {
+                                item.GradeDescription = "一级佣金";
+                            }
+                            else if (item.Grade == 2)
+                            {
+                                item.GradeDescription = "二级佣金";
+                            }
+                            else if (item.Grade == 3)
+                            {
+                                item.GradeDescription = "三级佣金";
+                            }
+                        } else if (item.Type == 2) {
+                            var hpGModel = HpgradeList.Where(x => x.Id == item.Grade).FirstOrDefault();
+                            item.GradeDescription = hpGModel?.GradeName ?? "暂无等级";
+                        }                        
                     }
                 }
                 foreach (var item in list)

Mall.Module.User/UserModule.cs

@@ -3091,6 +3091,7 @@ namespace Mall.Module.User
                         { nameof(RB_Distributor_HPCommission.Enabled),demodel.Enabled},
                         { nameof(RB_Distributor_HPCommission.Name),demodel.Name},
                         { nameof(RB_Distributor_HPCommission.DecimalType),demodel.DecimalType},
+                        { nameof(RB_Distributor_HPCommission.IsCommon),demodel.IsCommon},
                         { nameof(RB_Distributor_HPCommission.UpdateDate),demodel.UpdateDate}
                     };
                     List<WhereHelper> wheres = new List<WhereHelper>() {
@@ -3396,6 +3397,7 @@ namespace Mall.Module.User
                 return new
                 {
                     Status = 2,
+                    MPrice = 0,
                     Msg = "未配置和平返佣"
                 };
             }
@@ -3406,6 +3408,9 @@ namespace Mall.Module.User
             }
             else {
                 hpcList = distributor_HPCommissionRepository.GetList(new RB_Distributor_HPCommission_Extend() { CategoryIds = categoryIds, TenantId = tenantId, MallBaseId = mallBaseId });
+                if (!hpcList.Any()) {
+                    hpcList = distributor_HPCommissionRepository.GetList(new RB_Distributor_HPCommission_Extend() { IsCommon = 1, TenantId = tenantId, MallBaseId = mallBaseId });
+                }
             }
             if (hpcList.Any()) {
                 var hpcModel = hpcList.FirstOrDefault();
@@ -3428,6 +3433,7 @@ namespace Mall.Module.User
             return new
             {
                 Status = 3,
+                MPrice = 0,
                 Msg = "未匹配到适用的返佣"
             };
         }

Mall.Repository/Product/RB_Goods_OrderCommissionRepository.cs

@@ -77,7 +77,7 @@ namespace Mall.Repository.Product
                 where += $@" and {nameof(RB_Goods_OrderCommission.OrderId)} in({dmodel.OrderIds})";
             }
 
-            string sql = $@"SELECT OrderId,UserId,Grade,SUM(Commission) as Commission FROM RB_Goods_OrderCommission where {where} group by OrderId,UserId,Grade order by Grade asc";
+            string sql = $@"SELECT OrderId,UserId,Grade,Type,SUM(Commission) as Commission FROM RB_Goods_OrderCommission where {where} group by OrderId,UserId,Grade,Type order by Grade asc";
             return Get<RB_Goods_OrderCommission_Extend>(sql).ToList();
         }
 

Mall.Repository/User/RB_Distributor_HPCommissionRepository.cs

@@ -79,7 +79,7 @@ where {where} group by h.Id order by h.Id desc";
             }
             if (!string.IsNullOrEmpty(dmodel.CategoryIds))
             {
-                where += $@" and c.{nameof(RB_Distributor_HPCategory.CategoryId)} in({dmodel.CategoryId})";
+                where += $@" and c.{nameof(RB_Distributor_HPCategory.CategoryId)} in({dmodel.CategoryIds})";
             }
             if (!string.IsNullOrEmpty(dmodel.CategoryIdsT))
             {

Mall.Repository/User/RB_Distributor_HPGradeInfoRepository.cs

@@ -49,9 +49,12 @@ namespace Mall.Repository.User
         /// </summary>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Distributor_HPGradeInfo_Extend> GetList(RB_Distributor_HPGradeInfo_Extend dmodel)
+        public List<RB_Distributor_HPGradeInfo_Extend> GetList(RB_Distributor_HPGradeInfo_Extend dmodel, bool IsSelectDelete = false)
         {
-            string where = $@" 1=1 and {nameof(RB_Distributor_HPGradeInfo.Status)}=0";
+            string where = $@" 1=1 ";
+            if (IsSelectDelete == false) {
+                where = $@" 1=1 and {nameof(RB_Distributor_HPGradeInfo.Status)}=0";
+            }
             if (dmodel.TenantId > 0)
             {
                 where += $@" and {nameof(RB_Distributor_HPGradeInfo.TenantId)}={dmodel.TenantId}";

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -911,6 +911,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 OrderCommissionList= x.OrderCommissionList.Select(z=>new { 
                     z.Id,
                     z.Grade,
+                    z.GradeDescription,
                     z.UserId,
                     z.UserName,
                     z.Mobile,