Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/TradePavilion/RB_Building.cs

@@ -59,12 +59,12 @@ namespace Mall.Model.Entity.TradePavilion
         /// <summary>
         /// 楼层数
         /// </summary>
-        public int FloorNum { get; set; }
+        public string FloorNum { get; set; }
 
         /// <summary>
         /// 电梯数
         /// </summary>
-        public int ElevatorNum { get; set; }
+        public string ElevatorNum { get; set; }
 
         /// <summary>
         /// 层高

Mall.Model/Entity/TradePavilion/RB_EnterpriseServices.cs

@@ -74,12 +74,12 @@ namespace Mall.Model.Entity.TradePavilion
         /// <summary>
         /// 意向楼层
         /// </summary>
-        public int IntentionalFloor { get; set; }
+        public string IntentionalFloor { get; set; }
 
         /// <summary>
         /// 电梯数
         /// </summary>
-        public int ElevatorNum { get; set; }
+        public string ElevatorNum { get; set; }
 
         /// <summary>
         /// 物业费(元/㎡)

Mall.Module.TradePavilion/BuildingCarrierModule_V2.cs

@@ -1103,9 +1103,9 @@ namespace Mall.Module.TradePavilion
         /// <param name="rowsCount"></param>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_CompanyEnterprise_Extend> GetCompanyEnterprisePageListModule(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query)
+        public List<RB_CompanyEnterprise_Extend> GetCompanyEnterprisePageModule(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query)
         {
-            var list = companyEnterpriseRepository.GetCompanyPageListRepository(pageIndex, pageSize, out rowsCount, query);
+            var list = companyEnterpriseRepository.GetCompanyEnterprisePageRepository(pageIndex, pageSize, out rowsCount, query);
             if (list != null && list.Any())
             {
                 //查询用户列表
@@ -1114,11 +1114,10 @@ namespace Mall.Module.TradePavilion
                 foreach (var item in list)
                 {
                     var umodel = ulist.Where(x => x.Id == item.CreateBy).FirstOrDefault();
-                    item.UserName = umodel.Name;
-                    item.UserIcon = umodel.Photo;
+                    item.UserName = umodel?.Name ?? "";
+                    item.UserIcon = umodel?.Photo ?? "";
                 }
             }
-
             return list;
         }
 

Mall.Repository/TradePavilion/RB_CompanyEnterpriseRepository.cs

@@ -22,7 +22,7 @@ namespace Mall.Repository.TradePavilion
         /// <param name="rowsCount"></param>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_CompanyEnterprise_Extend> GetCompanyPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query)
+        public List<RB_CompanyEnterprise_Extend> GetCompanyEnterprisePageRepository(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query)
         {
             rowsCount = 0;
             DynamicParameters parameters = new DynamicParameters();

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -3361,7 +3361,7 @@ namespace Mall.WebApi.Controllers
                     //宜宾商再通特色颜色处理
                     if ((miniProgram.TenantId ?? 0) == 30)
                     {
-                        resultMallShopStyle = new ResultMallShopStyle() { main = "#017edf", secondary = "#ea850", IsEducation = 0 };
+                        resultMallShopStyle = new ResultMallShopStyle() { main = "#017edf", secondary = "#ea8505", IsEducation = 0 };
                     }
                     break;
                 case MallShopStyleEnum.PureBlack:

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -3911,7 +3911,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             };
             query.MallBaseId = userInfo.MallBaseId;
             query.TenantId = userInfo.TenantId;
-            var list = buildingCarrierModule.GetCompanyEnterprisePageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            var list = buildingCarrierModule.GetCompanyEnterprisePageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;
             return ApiResult.Success(data: pageModel);

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -4490,7 +4490,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
-            var list = buildingCarrierModule.GetCompanyEnterprisePageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            var list = buildingCarrierModule.GetCompanyEnterprisePageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;
             return ApiResult.Success(data: pageModel);

Mall.WebApi/Controllers/TradePavilion/YBTradeController.cs

@@ -116,8 +116,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 CategoryId=parms.GetInt("CategoryId"),
                 Areas=parms.GetStringValue("Areas"),
                 BuildingNum=parms.GetStringValue("BuildingNum"),
-                FloorNum=parms.GetInt("FloorNum"),
-                ElevatorNum=parms.GetInt("ElevatorNum"),
+                FloorNum=parms.GetStringValue("FloorNum"),
+                ElevatorNum=parms.GetStringValue("ElevatorNum"),
                 FloorHeight=parms.GetDecimal("FloorHeight"),
                 Developers=parms.GetStringValue("Developers"),
                 PropertyComp=parms.GetStringValue("PropertyComp"),
@@ -202,8 +202,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 CategoryName = extModel?.CategoryName ?? "",
                 Areas = extModel?.Areas ?? "",
                 BuildingNum = extModel?.BuildingNum ?? "",
-                FloorNum = extModel?.FloorNum ?? 0,
-                ElevatorNum = extModel?.ElevatorNum ?? 0,
+                FloorNum = extModel?.FloorNum ?? "",
+                ElevatorNum = extModel?.ElevatorNum ?? "",
                 FloorHeight = extModel?.FloorHeight ?? 0,
                 Developers = extModel?.Developers ?? "",
                 PropertyComp = extModel?.PropertyComp ?? "",
@@ -539,8 +539,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 Renovation = parms.GetStringValue("Renovation"),
                 Payment = parms.GetStringValue("Payment"),
                 HandoverDate = parms.GetStringValue("HandoverDate"),
-                IntentionalFloor = parms.GetInt("IntentionalFloor"),
-                ElevatorNum = parms.GetInt("ElevatorNum"),
+                IntentionalFloor = parms.GetStringValue("IntentionalFloor"),
+                ElevatorNum = parms.GetStringValue("ElevatorNum"),
                 PropertyFee = parms.GetDecimal("PropertyFee"),
                 RentFee = parms.GetDecimal("RentFee"),
                 ContactName = parms.GetStringValue("ContactName"),
@@ -616,8 +616,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 Renovation = extModel?.Renovation ?? "",
                 Payment = extModel?.Payment ?? "",
                 HandoverDate = extModel?.HandoverDate ?? "",
-                IntentionalFloor = extModel?.IntentionalFloor ?? 0,
-                ElevatorNum = extModel?.ElevatorNum ?? 0,
+                IntentionalFloor = extModel?.IntentionalFloor ?? "",
+                ElevatorNum = extModel?.ElevatorNum ?? "",
                 PropertyFee = extModel?.PropertyFee ?? 0,
                 RentFee = extModel?.RentFee ?? 0,
                 ContactName = extModel?.ContactName ?? "",

Mall.WebApi/Controllers/User/TenantController.cs

@@ -2205,11 +2205,12 @@ namespace Mall.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult TestYBBrandImport()
         {
-            string rootPath = Path.Combine(Directory.GetCurrentDirectory(), "upfile");
-            string filePath = rootPath+ @"\宜宾模板文件.xlsx";
-            string tempPath = rootPath + @"\TempImg";
-            var list = BrandHelper.ImportYBBrandData(filePath, tempPath);
-            return ApiResult.Success(data: Common.Plugin.JsonHelper.Serialize(list));
+            //string rootPath = Path.Combine(Directory.GetCurrentDirectory(), "upfile");
+            //string filePath = rootPath+ @"\宜宾模板文件.xlsx";
+            //string tempPath = rootPath + @"\TempImg";
+            //var list = BrandHelper.ImportYBBrandData(filePath, tempPath);
+            //return ApiResult.Success(data: Common.Plugin.JsonHelper.Serialize(list));
+            return ApiResult.Success();
         }
     }
 }
\ No newline at end of file