和平分销暂存+商品详情调整

Mall.Model/Entity/User/RB_Distributor_HPCommission.cs

@@ -47,6 +47,10 @@ namespace Mall.Model.Entity.User
             set;
         }
         /// <summary>
+        /// 是否通用返佣  1是  2否
+        /// </summary>
+        public int? IsCommon { get; set; }
+        /// <summary>
         /// 删除状态
         /// </summary>
         public int? Status { get; set; }

Mall.Model/Entity/User/RB_Distributor_HPGradeInfo.cs

@@ -70,5 +70,9 @@ namespace Mall.Model.Entity.User
         /// UpdateDate
         /// </summary>
         public DateTime? UpdateDate { get; set; }
+        /// <summary>
+        /// 是否直客等级
+        /// </summary>
+        public int? IsGuest { get; set; }
     }
 }

Mall.Model/Extend/User/RB_Distributor_HPCommission_Extend.cs

@@ -23,7 +23,7 @@ namespace Mall.Model.Extend.User
         public string CategoryIds { get; set; }
 
         /// <summary>
-        /// 分类ids
+        /// 分类ids(包含不限)
         /// </summary>
         public string CategoryIdsT { get; set; }
         /// <summary>
@@ -34,5 +34,9 @@ namespace Mall.Model.Extend.User
         /// 比例列表
         /// </summary>
         public List<RB_Distributor_HPGradeRatio_Extend> RatioList { get; set; }
+        /// <summary>
+        /// 是否通用
+        /// </summary>
+        public int? IsCommon { get; set; }
     }
 }

Mall.Model/Extend/User/RB_Distributor_HPGradeInfo_Extend.cs

@@ -13,6 +13,9 @@ namespace Mall.Model.Extend.User
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Distributor_HPGradeInfo_Extend : RB_Distributor_HPGradeInfo
     {
-         
+        /// <summary>
+        /// ids
+        /// </summary>
+        public string GradeIds { get; set; }
     }
 }

Mall.Module.User/UserModule.cs

@@ -1137,6 +1137,13 @@ namespace Mall.Module.User
                 {
                     GradeList = distributor_GradeRepository.GetList(new RB_Distributor_Grade_Extend() { GradeIds = gradeIds, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
                 }
+                //查询和平分销等级
+                string hpgradeIds = string.Join(",", list.Where(x => x.HPGradeId > 0).Select(x => x.HPGradeId ?? 0).Distinct());
+                List<RB_Distributor_HPGradeInfo_Extend> HPGradeList = new List<RB_Distributor_HPGradeInfo_Extend>();
+                if (!string.IsNullOrEmpty(gradeIds))
+                {
+                    HPGradeList = distributor_HPGradeInfoRepository.GetList(new RB_Distributor_HPGradeInfo_Extend() { GradeIds = gradeIds, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
+                }
                 //查询推荐人列表
                 string tjrIds = string.Join(",", list.Where(x => x.SuperiorId > 0).Select(x => x.SuperiorId ?? 0).Distinct());
                 List<RB_Member_User_Extend> UserList = new List<RB_Member_User_Extend>();
@@ -1162,6 +1169,15 @@ namespace Mall.Module.User
                     {
                         item.GradeName = GradeList.Where(x => x.Id == item.GradeId).FirstOrDefault()?.Name ?? "";
                     }
+                    if (item.HPGradeId == 0)
+                    {
+                        item.HPGradeName = "默认等级";
+                    }
+                    else if (item.HPGradeId > 0) {
+                        item.HPGradeName = HPGradeList.Where(x => x.Id == item.HPGradeId).FirstOrDefault()?.GradeName ?? "";
+                    }
+
+
                     if (item.SuperiorId == 0)
                     {
                         item.SuperiorName = "总店";
@@ -3042,6 +3058,22 @@ namespace Mall.Module.User
             return list;
         }
 
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="commissionId"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public RB_Distributor_HPCommission_Extend GetHpdistributorInfo(int commissionId, int tenantId, int mallBaseId)
+        {
+            var model = distributor_HPCommissionRepository.GetEntity<RB_Distributor_HPCommission_Extend>(commissionId);
+            model.CategoryList = distributor_HPCategoryRepository.GetList(new RB_Distributor_HPCategory_Extend() { CommissionId = commissionId, TenantId = tenantId, MallBaseId = mallBaseId });
+            //查询所有比例
+            model.RatioList = distributor_HPGradeRatioRepository.GetList(new RB_Distributor_HPGradeRatio_Extend() { CommissionId = commissionId, TenantId = tenantId, MallBaseId = mallBaseId });
+            return model;
+        }
+
         /// <summary>
         /// 新增修改和平分销
         /// </summary>

Mall.Repository/User/RB_Distributor_HPGradeInfoRepository.cs

@@ -64,6 +64,10 @@ namespace Mall.Repository.User
             {
                 where += $@" and {nameof(RB_Distributor_HPGradeInfo.Id)}={dmodel.Id}";
             }
+            if (!string.IsNullOrEmpty(dmodel.GradeIds)) 
+            {
+                where += $@" and {nameof(RB_Distributor_HPGradeInfo.Id)} in({dmodel.GradeIds})";
+            }
             if (dmodel.Grade > 0)
             {
                 where += $@" and {nameof(RB_Distributor_HPGradeInfo.Grade)}={dmodel.Grade}";

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -361,11 +361,37 @@ namespace Mall.WebApi.Controllers.MallBase
                 return ApiResult.ParamIsNull();
             }
             int UserId = prams.GetInt("UserId", 0);
+            
+            var Robj = productModule.GetAppletGoodsInfo_V2(GoodsId, UserId, req.TenantId, req.MallBaseId);
+            return ApiResult.Success("", Robj);
+        }
+
+        /// <summary>
+        /// 获取小程序商品详情备份
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAppletGoodsInfoBack(object requestMsg)
+        {
+            var req = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            if (req.MallBaseId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            JObject prams = JObject.Parse(req.msg.ToString());
+            int GoodsId = prams.GetInt("GoodsId", 0);
+            if (GoodsId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            int UserId = prams.GetInt("UserId", 0);
             RB_Member_User_Extend userModel = new RB_Member_User_Extend();
             List<RB_Member_Grade_Extend> memeberList = new List<RB_Member_Grade_Extend>();
-            if (UserId > 0) {
+            if (UserId > 0)
+            {
                 userModel = productModule.GetMemberUserInfo(UserId);
-                if (userModel.MemberGrade > 0) {
+                if (userModel.MemberGrade > 0)
+                {
                     memeberList = productModule.GetMemberGradeList(new RB_Member_Grade_Extend() { Enabled = 1, TenantId = req.TenantId, MallBaseId = req.MallBaseId });
                 }
             }
@@ -422,9 +448,11 @@ namespace Mall.WebApi.Controllers.MallBase
                                 }
                             }
                         }
-                        else {
+                        else
+                        {
                             //根据会员等级查找会员价格
-                            foreach (var qitem in memeberList) {
+                            foreach (var qitem in memeberList)
+                            {
                                 var mprice = Math.Round((item.SellingPrice ?? 0) * (qitem.Discount ?? 0) / 10, 2, MidpointRounding.AwayFromZero);
                                 member_price_list.Add(new
                                 {
@@ -460,7 +488,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     }
                 }
             }
-            else {
+            else
+            {
                 decimal price_member = model.SellingPrice ?? 0;//未设会员价格的话  就为销售价格
                 List<object> member_price_list = new List<object>();
                 if (model.EnjoyMember == 1 && model.SeparateSetMember == 1)
@@ -481,7 +510,8 @@ namespace Mall.WebApi.Controllers.MallBase
                             var gmodel = mlist.Where(x => x.MemberGrade == userModel.MemberGrade).FirstOrDefault();
                             price_member = gmodel.MemberPrice ?? 0;
                         }
-                        else {
+                        else
+                        {
                             price_member = mlist.Max(x => x.MemberPrice ?? 0);
                         }
                     }
@@ -503,13 +533,13 @@ namespace Mall.WebApi.Controllers.MallBase
                         var gmodel = memeberList.Where(x => x.Grade == userModel.MemberGrade).FirstOrDefault();
                         price_member = Math.Round((model.SellingPrice ?? 0) * (gmodel?.Discount ?? 10) / 10, 2, MidpointRounding.AwayFromZero);
                     }
-                    else if(memeberList.Any())
+                    else if (memeberList.Any())
                     {
                         price_member = Math.Round((model.SellingPrice ?? 0) * (memeberList.Max(x => x.Discount) ?? 10) / 10, 2, MidpointRounding.AwayFromZero);
                     }
                 }
 
-                
+
                 priceList.Add(new
                 {
                     id = 0,
@@ -519,9 +549,9 @@ namespace Mall.WebApi.Controllers.MallBase
                     price = model.SellingPrice ?? 0,
                     no = model.GoodsNumbers,
                     weight = model.GoodsWeight,
-                    pic_url="",
+                    pic_url = "",
                     is_delete = 0,
-                    attr_list=new List<object>(){ new
+                    attr_list = new List<object>(){ new
                     {
                         attr_group_name = "规格",
                         attr_group_id = 0,
@@ -535,9 +565,11 @@ namespace Mall.WebApi.Controllers.MallBase
             #endregion
             #region 赠送积分
             int Integral = 0;
-            if (model.IntegralPresent > 0) {
+            if (model.IntegralPresent > 0)
+            {
                 Integral = model.IntegralPresent ?? 0;
-                if (model.IntegralPresentType == 2) {
+                if (model.IntegralPresentType == 2)
+                {
                     Integral = Convert.ToInt32(Math.Floor((model.SellingPrice ?? 0) * (model.IntegralPresent ?? 0) / 100));
                 }
             }
@@ -554,14 +586,16 @@ namespace Mall.WebApi.Controllers.MallBase
                     price_max = model.MemberPriceList.Where(x => x.MemberGrade == userModel.MemberGrade).Max(x => x.MemberPrice ?? 0);
                 }
             }
-            else {
-                
+            else
+            {
+
                 if (model.IsCustomSpecification == 1)
                 {
                     price_member_min = price_min = model.SpecificationPriceList.Min(x => x.SellingPrice ?? 0);
                     price_member_max = price_max = model.SpecificationPriceList.Max(x => x.SellingPrice ?? 0);
                 }
-                else {
+                else
+                {
                     price_member_min = price_member_max = price_min = price_max = model.SellingPrice ?? 0;
                 }
                 if (memeberList.Any())
@@ -581,7 +615,7 @@ namespace Mall.WebApi.Controllers.MallBase
                         price_min = price_member_min * (memeberList.Where(x => x.Id == userModel.MemberGrade).FirstOrDefault()?.Discount ?? 10) / 10;
                         price_max = price_member_max * (memeberList.Where(x => x.Id == userModel.MemberGrade).FirstOrDefault()?.Discount ?? 10) / 10;
                     }
-                }                
+                }
             }
             price_member_max = Math.Round(price_member_max, 2, MidpointRounding.AwayFromZero);
             price_member_min = Math.Round(price_member_min, 2, MidpointRounding.AwayFromZero);
@@ -590,7 +624,7 @@ namespace Mall.WebApi.Controllers.MallBase
             #endregion
             #region 订单信息
 
-            int payment_people = 0, payment_num = 0,  payment_order = 0;//订单用户  商品数量   订单数量
+            int payment_people = 0, payment_num = 0, payment_order = 0;//订单用户  商品数量   订单数量
             decimal payment_amount = 0;//订单总金额
             productModule.GetGoodsOrderPeopleInfo(out payment_amount, out payment_num, out payment_order, out payment_people, GoodsId);
             #endregion
@@ -628,7 +662,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     forehead_integral = model.PointsDeduction,//暂  积分抵扣
                     forehead_integral_type = model.PointsDeductionType,//暂  积分抵扣类型
                     accumulative = model.IsMultipleDeduction,//多件抵扣
-                    individual_share = userModel?.IsDistributor??2,// 是否分销商
+                    individual_share = userModel?.IsDistributor ?? 2,// 是否分销商
                     attr_setting_type = model.SeparateDistributionType,//分销类型
                     is_level = model.EnjoyMember,//是否销售会员价格
                     is_level_alone = model.SeparateSetMember,//是否单独设置会员价
@@ -661,7 +695,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     unit = model.Unit,
                     detail = model.GoodsDetails,
                     video_url = model.VideoAddress,
-                    level_show = (userModel?.MemberGrade??0)>0?1:2,//是否显示会员价
+                    level_show = (userModel?.MemberGrade ?? 0) > 0 ? 1 : 2,//是否显示会员价
                     is_sales = model.GoodsStatus == 1 && model.InventoryNum > 0 ? 1 : 2,//是否可购买
                     attr = priceList,
                     //goods_num = model.InventoryNum,
@@ -712,7 +746,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     is_quick_shop = model.IsQuickBuy,
                     is_sell_well = model.IsSellWell,
                     is_negotiable = model.IsGoodsNegotiable,
-                    cats = model.CategoryList.Select(x=>new { 
+                    cats = model.CategoryList.Select(x => new {
                         x.CategoryId,
                         x.CategoryName
                     })//分类

Mall.WebApi/Controllers/User/UserController.cs

@@ -1391,6 +1391,8 @@ namespace Mall.WebApi.Controllers.User
                 x.ThreeNum,
                 x.GradeId,
                 x.GradeName,
+                x.HPGradeId,
+                x.HPGradeName,
                 x.AuditStatus,
                 AuditStatusName = x.AuditStatus.GetEnumName(),
                 x.Remark,
@@ -2206,6 +2208,7 @@ namespace Mall.WebApi.Controllers.User
                 x.Id,
                 x.Grade,
                 x.GradeName,
+                x.IsGuest,
                 UpdateDate = x.UpdateDate.HasValue ? x.UpdateDate.Value.ToString("yyyy-MM-dd") : ""
             });
             return ApiResult.Success("", pagelist);
@@ -2227,6 +2230,7 @@ namespace Mall.WebApi.Controllers.User
             return ApiResult.Success("", list.Select(x => new
             {
                 x.Id,
+                x.Grade,
                 x.GradeName
             }));
         }
@@ -2249,6 +2253,7 @@ namespace Mall.WebApi.Controllers.User
             demodel.TenantId = req.TenantId;
             demodel.MallBaseId = req.MallBaseId;
             demodel.Status = 0;
+            demodel.IsGuest ??= 2;
             demodel.CreateDate = DateTime.Now;
             demodel.UpdateDate = DateTime.Now;
             bool flag = userModule.SetHpDistributorGradeInfo(demodel);
@@ -2304,6 +2309,7 @@ namespace Mall.WebApi.Controllers.User
                 x.Name,
                 x.DecimalType,
                 x.Enabled,
+                x.IsCommon,
                 CategoryList = x.CategoryList.Select(y=>new { 
                     y.Id,
                     y.CategoryId,
@@ -2320,6 +2326,46 @@ namespace Mall.WebApi.Controllers.User
             return ApiResult.Success("", pagelist);
         }
 
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetHpdistributorInfo() {
+            var req = RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int CommissionId = parms.GetInt("CommissionId", 0);
+            if (CommissionId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+
+            var model = userModule.GetHpdistributorInfo(CommissionId, req.TenantId, req.MallBaseId);
+
+            return ApiResult.Success("", new
+            {
+                model.Id,
+                model.Name,
+                model.DecimalType,
+                model.Enabled,
+                model.IsCommon,
+                CategoryList = model.CategoryList.Select(y => new
+                {
+                    y.Id,
+                    y.CategoryId,
+                    y.CategoryName
+                }),
+                RatioList = model.RatioList.Select(z => new
+                {
+                    z.Id,
+                    z.GradeId,
+                    z.GradeName,
+                    z.CommissionRatio
+                }),
+                UpdateDate = model.UpdateDate.HasValue ? model.UpdateDate.Value.ToString("yyyy-MM-dd") : ""
+            });
+        }
+
         /// <summary>
         /// 新增修改和平分销返佣
         /// </summary>
@@ -2348,6 +2394,10 @@ namespace Mall.WebApi.Controllers.User
                     return ApiResult.ParamIsNull("返佣比例有误，不能大于100");
                 }
             }
+            demodel.IsCommon = 2;
+            if (demodel.CategoryList == null && !demodel.CategoryList.Any()) {
+                demodel.IsCommon = 1;//通用
+            }
 
             demodel.TenantId = req.TenantId;
             demodel.MallBaseId = req.MallBaseId;