页面修改

Mall.Module.User/MenuModule.cs

@@ -57,6 +57,7 @@ namespace Mall.Module.User
                     { nameof(RB_Menu_Extend.MenuLevel),extModel.MenuLevel},
                     { nameof(RB_Menu_Extend.ParentId),extModel.ParentId},
                     { nameof(RB_Menu_Extend.IconClass),extModel.IconClass},
+                    { nameof(RB_Menu_Extend.SortNum),extModel.SortNum},
                 };
                 flag = menuRepository.Update(fileds, new WhereHelper(nameof(RB_Menu_Extend.MenuId), extModel.MenuId));
             }

Mall.Module.User/MiniProgramModule.cs

@@ -55,6 +55,16 @@ namespace Mall.Module.User
             return programRepository.Exists(wheres);
         }
 
+        /// <summary>
+        /// 检查小程序数量
+        /// </summary>
+        /// <param name="TenantId">商户Id</param>
+        /// <returns></returns>
+        public int CheckMallNumModule(int TenantId)
+        {
+            return programRepository.CheckMallNumRepository(TenantId);
+        }
+
         /// <summary>
         /// 添加修改小程序
         /// </summary>

Mall.Repository/User/RB_MiniProgramRepository.cs

@@ -32,6 +32,7 @@ namespace Mall.Repository.User
             return Get<RB_MiniProgram_Extend>(builder.ToString()).ToList();
         }
 
+
         /// <summary>
         /// 获取小程序分页列表
         /// </summary>
@@ -64,5 +65,24 @@ WHERE 1=1 ");
             }
             return GetPage<RB_MiniProgram_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
         }
+
+        /// <summary>
+        /// 检查小程序数量
+        /// </summary>
+        /// <param name="TenantId">商户Id</param>
+        /// <returns></returns>
+        public int CheckMallNumRepository(int TenantId)
+        {
+            int Num = 0;
+            StringBuilder builder = new StringBuilder();
+            builder.Append("SELECT  COUNT(*) FROM RB_MiniProgram WHERE 1=1 ");
+            builder.AppendFormat(" AND TenantId='{0}' ", TenantId);
+            object obj = base.ExecuteScalar(builder.ToString());
+            if (obj != null)
+            {
+                Int32.TryParse(obj.ToString(), out Num);
+            }
+            return Num;
+        }
     }
 }

Mall.WebApi/Controllers/User/TenantController.cs

@@ -130,10 +130,6 @@ namespace Mall.WebApi.Controllers.User
         public ApiResult SetTenantSecond()
         {
             var extModel = JsonConvert.DeserializeObject<RB_Tenant_Extend>(RequestParm.msg.ToString());
-            if (TenantModule.CheckTenantModule(extModel))
-            {
-                return ApiResult.Failed(message: "此账号已存在!");
-            }
             extModel.AccountStatus = 0;
             var flag = TenantModule.SetTenantSecondModule(extModel);
             return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed();
@@ -176,8 +172,15 @@ namespace Mall.WebApi.Controllers.User
         {
             var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_Extend>(RequestParm.msg.ToString());
             Int32.TryParse(RequestParm.uid.ToString(), out int TenantId);
+            var programNum = programModule.CheckMallNumModule(TenantId);
+            var createMiniPrograme = TenantModule.GetTenantModule(TenantId)?.CreateMiniPrograme ?? 0;
+            if (extModel.MallBaseId==0 && programNum >= createMiniPrograme)
+            {
+                return ApiResult.Failed(message: "只能创建" + createMiniPrograme + "个小程序");
+            }
             extModel.TenantId = TenantId;
             var flag = programModule.SetMiniProgramModule(extModel);
+
             return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed();
         }