提交代码

Mall.Module.TradePavilion/CompanyModule.cs

@@ -621,6 +621,14 @@ namespace Mall.Module.TradePavilion
                                     {
                                         FirstStoreTest = 1;
                                     }
+                                    int OpeningStatus = 0;
+                                    if (CarrierModel.OpenTime.HasValue)
+                                    {
+                                        if (CarrierModel.OpenTime.Value < System.DateTime.Now)
+                                        {
+                                            OpeningStatus = 1;
+                                        }
+                                    }
                                     Dictionary<string, object> filedsCarrier = new Dictionary<string, object>()
                                     {
                                         {nameof(RB_Carrier_Extend.Logo),CarrierModel.Logo },
@@ -649,7 +657,8 @@ namespace Mall.Module.TradePavilion
                                         {nameof(RB_Carrier_Extend.EndBuiltUpArea),CarrierModel.EndBuiltUpArea },
                                         {nameof(RB_Carrier_Extend.FirstShopNum),CarrierModel.FirstShopNum },
                                         {nameof(RB_Carrier_Extend.StartingInfo),CarrierModel.StartingInfo },
-                                          {nameof(RB_Carrier_Extend.FirstStoreTest),FirstStoreTest }
+                                          {nameof(RB_Carrier_Extend.FirstStoreTest),FirstStoreTest },
+                                          {nameof(RB_Carrier_Extend.OpeningStatus),OpeningStatus }
                                     };
                                     flag = carrierRepository.Update(filedsCarrier, new WhereHelper(nameof(RB_Carrier_Extend.ID), carrmodel.ID), trans);
                                     if (flag)

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -270,10 +270,43 @@ 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 (!query.ShopNum.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);