提交代码

Mall.Model/Entity/TradePavilion/RB_CarrierApplyFor.cs

@@ -180,34 +180,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

@@ -298,6 +298,12 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 query.FirstShopNum = "";
             }
+            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.CreateDate = DateTime.Now;
             query.MallBaseId = userInfo.MallBaseId;
             query.TenantId = userInfo.TenantId;
@@ -872,7 +878,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             RB_Commerce_Consult_Extend model = new RB_Commerce_Consult_Extend()
             {
                 Id = parms.GetInt("Id", 0),
-                ActivityId=parms.GetInt("ActivityId"),
+                ActivityId = parms.GetInt("ActivityId"),
                 LinkMan = parms.GetStringValue("LinkMan"),
                 LinkTel = parms.GetStringValue("LinkTel"),
                 Post = parms.GetStringValue("Post"),
@@ -1041,7 +1047,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         public ApiResult SetFirstShopActivityEnroll()
         {
-       
+
             var request = RequestParm;
             var userInfo = AppletUserInfo;
             if (userInfo == null)
@@ -1107,8 +1113,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 ActivityId = jObj.GetInt("ActivityId"),
                 MallBaseId = userInfo.MallBaseId,
-                TenantId = userInfo.TenantId ,
-                UserId=userInfo.UserId
+                TenantId = userInfo.TenantId,
+                UserId = userInfo.UserId
             };
             var list = consultModule.GetCommerceConsultListModule(extModel);
             return ApiResult.Success("", list);
@@ -1597,7 +1603,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 extModel.CarrierMetroList,
                 extModel.BannerList,
                 extModel.CollectId,
-                Discount=  extModel.Discount??"",
+                Discount = extModel.Discount ?? "",
                 extModel.HonorList,
                 extModel.YeJi,
                 extModel.ShopNum,
@@ -1606,7 +1612,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 extModel.BuiltUpArea,
                 extModel.EndBuiltUpArea,
                 extModel.FirstShopNumList,
-                StartingInfo=  extModel.StartingInfo??"",
+                StartingInfo = extModel.StartingInfo ?? "",
                 listEnroll,
                 extModel.OpeningStatus,
                 extModel.FirstStoreTest