Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Common/Config.cs

@@ -720,8 +720,17 @@ namespace Mall.Common
                 return ReadConfigKey("XuZongUserId");
             }
         }
-
-
+        /// <summary>
+        ///首店企业认证是否自动审核，1-是 
+        /// </summary>
+        public static string IsFirtsShopAutoExamine
+        {
+            get
+            {
+                return ReadConfigKey("IsFirtsShopAutoExamine");
+            }
+        }
         
+
     }
 }
\ No newline at end of file

Mall.Module.TradePavilion/CompanyModule.cs

@@ -624,7 +624,7 @@ namespace Mall.Module.TradePavilion
                                     int OpeningStatus = 0;
                                     if (CarrierModel.OpenTime.HasValue)
                                     {
-                                        if (CarrierModel.OpenTime.Value < System.DateTime.Now)
+                                        if (CarrierModel.OpenTime.Value <= System.DateTime.Now)
                                         {
                                             OpeningStatus = 1;
                                         }
@@ -691,6 +691,13 @@ namespace Mall.Module.TradePavilion
                                     var inserCModel = CarrierModel.RefMapperTo<RB_Carrier_Extend>();
                                     inserCModel.ID = 0;
                                     inserCModel.UserId = cmodel.CreateBy;
+                                    if (CarrierModel.OpenTime.HasValue)
+                                    {
+                                        if (CarrierModel.OpenTime.Value <= System.DateTime.Now)
+                                        {
+                                            inserCModel.OpeningStatus = 1;
+                                        }
+                                    }
                                     int Id = carrierRepository.Insert(inserCModel, trans);
                                     if (Id > 0)
                                     {

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -243,6 +243,17 @@ namespace Mall.WebApi.Controllers.TradePavilion
                     return ApiResult.Failed("该品牌全名已存在,请选择绑定已有品牌");
                 }
             }
+            //修改
+            #region 验证品牌是否已关联用户
+            if (query.ExistBrandId > 0)
+            {
+                var bmodel = carrierModule.GetBrand(new RB_Brand_Extend { ID = query.ExistBrandId, MallBaseId = query.MallBaseId, TenantId = query.TenantId });
+                if (bmodel.UserId > 0)
+                {
+                    return ApiResult.Failed("该品牌已被其他用户认证，请核实后再试");
+                }
+            }
+            #endregion
             #endregion
 
             bool flag = carrierModule.SetBrandApplyFor(query);
@@ -345,6 +356,18 @@ namespace Mall.WebApi.Controllers.TradePavilion
                     return ApiResult.Failed("该载体名称已存在,请选择绑定已有载体");
                 }
             }
+
+            //修改
+            #region 验证品牌是否已关联用户
+            if (query.ExistCarrierId > 0)
+            {
+                var carrmodel = carrierModule.GetCarrierModel(new RB_Carrier_Extend { ID = query.ExistCarrierId, TenantId = query.TenantId, MallBaseId = query.MallBaseId });
+                if (carrmodel.UserId > 0)
+                {
+                    return ApiResult.Failed("该载体已被其他用户认证，请核实后再试");
+                }
+            }
+            #endregion
             #endregion
 
             bool flag = carrierModule.SetCarrierApplyFor(query);

Mall.WebApi/appsettings.json

@@ -81,6 +81,7 @@
     "VirtualDirectory": "WebFile",
     "FileService": "2",
     "IsNormalServer": 2,
+    "IsFirtsShopAutoExamine": 1,//首店企业认证是否字段审核
     "FinanceSetting": {
         "TenantId": 1,
         "MallBaseId": 1,