1

Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs

@@ -687,8 +687,8 @@ namespace Mall.Module.TradePavilion
                             inserCModel.UserId = cmodel.CreateBy;
                             inserCModel.BuiltUpArea = model.BuiltUpArea ?? 0;
                             inserCModel.AreaRequirement = model.AreaRequirement ?? 0;
-                           
-                           
+
+
                             if (model.OpenTime.HasValue)
                             {
                                 if (model.OpenTime.Value <= System.DateTime.Now)
@@ -840,7 +840,7 @@ namespace Mall.Module.TradePavilion
                     }
                     else if (model.FirstShopType == 2)
                     {
-                        var clist = building_CarrierRepository.GetBuildingCarrierListRepository(new RB_Building_Carrier_Extend() {OpeningStatus=-1,TenantId = model.TenantId, MallBaseId = model.MallBaseId, UserId = userId });;
+                        var clist = building_CarrierRepository.GetBuildingCarrierListRepository(new RB_Building_Carrier_Extend() { OpeningStatus = -1, TenantId = model.TenantId, MallBaseId = model.MallBaseId, UserId = userId }); ;
                         if (clist.Any())
                         {
                             model.CarrierModel = clist.FirstOrDefault().RefMapperTo<RB_CarrierEnterpriseApplyFor_Extend>();
@@ -869,9 +869,9 @@ namespace Mall.Module.TradePavilion
                         //审核通过了的  直接查询资料表
                         var blist = enterpriseServicesRepository.GetEnterpriseServicesListRepository(new RB_EnterpriseServices_Extend() { TenantId = model.TenantId, MallBaseId = model.MallBaseId, UserId = userId });
                         model.EnterpriseServicesModel = blist.FirstOrDefault().RefMapperTo<RB_EnterpriseServicesApply_Extend>();
+                        model.EnterpriseServicesModel.ID = blist.FirstOrDefault().ServiceId;
                         if (model.EnterpriseServicesModel != null)
                         {
-
                             if (!string.IsNullOrWhiteSpace(model.EnterpriseServicesModel.Banner))
                             {
                                 model.EnterpriseServicesModel.BannerList = JsonConvert.DeserializeObject<List<string>>(model.EnterpriseServicesModel.Banner);

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -2983,7 +2983,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 extModel.ManagementCompany,
                 extModel.BrandDemand,
                 extModel.HonorList,
-
+                OpenTime= StringHelper.FormatDate(extModel.OpenTime),
             });
         }
 
@@ -3428,7 +3428,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
         {
             var userInfo = AppletUserInfo;
             RB_EnterpriseServices_Extend query = JsonConvert.DeserializeObject<RB_EnterpriseServices_Extend>(RequestParm.msg.ToString());
-
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            int ID = parms.GetInt("ID");
+            query.ServiceId = ID;
             if (query.ServiceId <= 0)
             {
                 return ApiResult.ParamIsNull("请传递企业id");
@@ -3456,7 +3458,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.UpdateDate = System.DateTime.Now;
             query.CreateBy = userInfo.UserId;
 
-            var oldModel = buildingCarrierModule.GetBrandEnterpriseModule(query.ServiceId);
+            var oldModel = buildingCarrierModule.GetEnterpriseServicesInfoModule(query.ServiceId);
             if (oldModel == null) { return ApiResult.Failed("企业信息不存在"); }
             if (oldModel.UserId != userInfo.UserId) { return ApiResult.Failed("无法修改此企业信息"); }
 
@@ -3623,7 +3625,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 ID = parms.GetInt("ID"),
                 Name = parms.GetStringValue("Name"),
-                Introduction = parms.GetStringValue("FullBIntroductionrandName"),
+                Introduction = parms.GetStringValue("Introduction"),
                 DevIntention = parms.GetStringValue("DevIntention"),
                 Address = parms.GetStringValue("Address"),
                 LatAndLon = parms.GetStringValue("LatAndLon"),