提交代码

Mall.Model/Entity/TradePavilion/RB_Carrier.cs

@@ -185,34 +185,34 @@ namespace Mall.Model.Entity.TradePavilion
         /// <summary>
         /// 去年业绩（单位：W）
         /// </summary>
-        public decimal YeJi { get; set; }
+        public decimal? YeJi { get; set; }
 
         /// <summary>
         /// 店铺数量
         /// </summary>
-        public int ShopNum { get; set; }
+        public int? ShopNum { get; set; }
 
         /// <summary>
         /// 可租赁面积
         /// </summary>
-        public decimal AreaRequirement { get; set; }
+        public decimal? AreaRequirement { get; set; }
 
         /// <summary>
         /// 可租赁面积
         /// </summary>
-        public decimal EndAreaRequirement { get; set; }
+        public decimal? EndAreaRequirement { get; set; }
 
 
 
         /// <summary>
         /// 经营面积
         /// </summary>
-        public decimal BuiltUpArea { get; set; }
+        public decimal? BuiltUpArea { get; set; }
 
         /// <summary>
         /// 经营面积
         /// </summary>
-        public decimal EndBuiltUpArea { get; set; }
+        public decimal? EndBuiltUpArea { get; set; }
 
 
         /// <summary>

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -286,11 +286,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 return ApiResult.Failed("请输入可租赁面积");
             }
-            if (!query.ShopNum.HasValue)
-            {
-                return ApiResult.Failed("请输入店铺数量");
-            }
-
             if (string.IsNullOrWhiteSpace(query.Logo))
             {
                 return ApiResult.Failed("请上传Logo");

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -1394,6 +1394,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         public ApiResult GetSetCarrier()
         {
             RB_Carrier_Extend query = JsonConvert.DeserializeObject<RB_Carrier_Extend>(RequestParm.msg.ToString());
+            
             if (string.IsNullOrWhiteSpace(query.CarrierName))
             {
                 return ApiResult.Failed("请输入载体名称");
@@ -1402,10 +1403,40 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 return ApiResult.Failed("请输入开发商");
             }
+            if (string.IsNullOrWhiteSpace(query.Address))
+            {
+                return ApiResult.Failed("请输入项目地址");
+            }
+            if (!query.ShopNum.HasValue)
+            {
+                return ApiResult.Failed("请输入店铺数量");
+            }
+            if (!query.BuiltUpArea.HasValue)
+            {
+                return ApiResult.Failed("请输入经营面积");
+            }
+            if (!query.AreaRequirement.HasValue)
+            {
+                return ApiResult.Failed("请输入可租赁面积");
+            }
+            
+            if (string.IsNullOrWhiteSpace(query.Logo))
+            {
+                return ApiResult.Failed("请上传Logo");
+            }
             if (query.BannerList == null || !query.BannerList.Any())
             {
                 return ApiResult.Failed("请上传介绍图");
             }
+            if (!query.OpenTime.HasValue)
+            {
+                return ApiResult.Failed("请输入开业时间");
+            }
+            if (!query.ProjectType.HasValue)
+            {
+                return ApiResult.Failed("请选择项目类型");
+            }
+
             if (query.BannerList != null && query.BannerList.Any())
             {
                 query.Banner = JsonConvert.SerializeObject(query.BannerList);
@@ -1440,7 +1471,12 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 query.FirstStoreTest = 1;
             }
-
+            query.ShopNum = query.ShopNum ?? 0;
+            query.BuiltUpArea = query.BuiltUpArea ?? 0;
+            query.EndBuiltUpArea = query.EndBuiltUpArea ?? 0;
+            query.AreaRequirement = query.AreaRequirement ?? 0;
+            query.EndAreaRequirement = query.EndAreaRequirement ?? 0;
+            query.YeJi = query.YeJi ?? 0;
             query.UpdateDate = System.DateTime.Now;
             bool flag = carrierModule.SetCarrier(query);
             return flag ? ApiResult.Success() : ApiResult.Failed();