提交代码

Mall.Module.User/UserModule.cs

@@ -6077,6 +6077,18 @@ namespace Mall.Module.User
             }
             return false;
         }
-        #endregion
-    }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_SmallShops_Info_Extend> GetSmallShopsInfoList(RB_SmallShops_Info_Extend dmodel)
+        {
+            return smallShopsInfoRepository.GetList(dmodel);
+        }
+
+
+            #endregion
+        }
 }

Mall.WebApi/Controllers/MallBase/MallBaseController.cs

@@ -1177,7 +1177,9 @@ namespace Mall.WebApi.Controllers.MallBase
                 }
                 if (query.PriceType == 1)
                 {
-                    query.FixedPrice = 0;
+                    query.CustomMaxFixedPrice = 0;
+                    query.CustomMinFixedPrice = 0;
+
                 }
                 else if (query.PriceType == 2)
                 {

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -19,6 +19,7 @@ using Mall.Model.Extend.MarketingCenter;
 using Mall.Model.Entity.User;
 using NPOI.SS.Formula.Functions;
 using Google.Protobuf.WellKnownTypes;
+using Mall.Module.BaseSetUp;
 
 namespace Mall.WebApi.Controllers.User
 {
@@ -35,6 +36,7 @@ namespace Mall.WebApi.Controllers.User
         private readonly UserVipModule userVipModule = new UserVipModule();
         private readonly SupplierModule supplierModule = new SupplierModule();
         private readonly Module.Product.ProductModule productModule = new Module.Product.ProductModule();
+        private readonly MallBaseModule MallBaseModule = new MallBaseModule();
         #region 收货地址
 
         /// <summary>
@@ -1709,7 +1711,60 @@ namespace Mall.WebApi.Controllers.User
             var userInfo = AppletUserInfo;
             RB_SmallShops_Info_Extend demodel = JsonConvert.DeserializeObject<RB_SmallShops_Info_Extend>(req.msg.ToString());
             //判断是否满足当前申请条件
+            var microShopBasics = MallBaseModule.GetMicroShopBasicsList(new Model.Entity.BaseSetUp.RB_MicroShop_Basics { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
 
+            if (microShopBasics == null)
+            {
+                return ApiResult.Failed("微店申请暂未开启");
+            }
+            if (microShopBasics.IsOpen != 2)
+            {
+                return ApiResult.Failed("微店申请暂未开启");
+            }
+            if (microShopBasics.ApplyCondition > 0)
+            {
+                var distributorInfoModel = userModule.GetDistributorInfoList(new RB_Distributor_Info_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId }).FirstOrDefault();
+                if (microShopBasics.ApplyMemberLevel > 0 && microShopBasics.ApplyCondition == 1)
+                {
+                    var list = userModule.GetDistributorGradeDropdownList(new RB_Distributor_Grade_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
+
+                    var nowLevel = list.Where(x => x.Id == microShopBasics.ApplyMemberLevel).FirstOrDefault();//申请等级的最低id
+                    var memberLevel = list.Where(x => x.Id == distributorInfoModel.GradeId).FirstOrDefault();//会员当前的等级
+                    if ((memberLevel.Grade ?? 0) < (nowLevel.Grade ?? 0))
+                    {
+                        return ApiResult.Failed("当前等级不满足");
+                    }
+                }
+                else if (microShopBasics.ApplyMemberLevel > 0 && microShopBasics.ApplyCondition == 2)
+                {
+                    var list = userModule.GetFXDistributorGradeList(new RB_Distributor_FXGrade_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
+
+                    var nowLevel = list.Where(x => x.Id == microShopBasics.ApplyMemberLevel).FirstOrDefault();//申请等级的最低id
+                    var memberLevel = list.Where(x => x.Id == distributorInfoModel.FXGradeId).FirstOrDefault();//会员当前的等级
+                    if ((memberLevel.Grade ?? 0) < (nowLevel.Grade ?? 0))
+                    {
+                        return ApiResult.Failed("当前等级不满足");
+                    }
+                }
+            }
+
+            //判断是否已经申请过，已申请并拒绝不能再次申请
+            var oldList = userModule.GetSmallShopsInfoList(new RB_SmallShops_Info_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId }).OrderByDescending(x => x.CreateDate).FirstOrDefault();
+            if (oldList != null)
+            {
+                if (oldList.AuditStatus == DistributorAuditStatusEnum.Reject)
+                {
+                    return ApiResult.Failed("您之前的申请已被拒绝，不能再次申请");
+                }
+                else if (oldList.AuditStatus == DistributorAuditStatusEnum.Audited)
+                {
+                    return ApiResult.Failed("您的申请已通过，请勿重复申请");
+                }
+                else if (oldList.AuditStatus == DistributorAuditStatusEnum.Auditing)
+                {
+                    return ApiResult.Failed("您已申请,请等待审核");
+                }
+            }
 
             if (string.IsNullOrEmpty(demodel.Name))
             {
@@ -1725,7 +1780,7 @@ namespace Mall.WebApi.Controllers.User
             demodel.CreateDate = DateTime.Now;
             demodel.UpdateDate = DateTime.Now;
             demodel.Status = 0;
-            demodel.AuditStatus = DistributorAuditStatusEnum.Auditing;
+            demodel.AuditStatus = microShopBasics.IsExamine == 1 ? DistributorAuditStatusEnum.Audited : DistributorAuditStatusEnum.Auditing;
             bool flag = userModule.ApplySmallShopsInfo(demodel);
             if (flag)
             {