页面修改

Mall.Common/Plugin/ConvertHelper.cs

@@ -155,6 +155,31 @@ namespace Mall.Common
             return result;
         }
 
+        /// <summary>
+        /// 字符串状态List<int>
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static List<string> ConvertToListString(object obj)
+        {
+            List<string> result = new List<string>();
+            if (obj != null && !string.IsNullOrWhiteSpace(obj.ToString()))
+            {
+                var tempArray = obj.ToString().Split(',');
+                if (tempArray != null && tempArray.Length > 0)
+                {
+                    foreach (var item in tempArray)
+                    {
+                        if (!string.IsNullOrEmpty(item))
+                        {
+                            result.Add(item);
+                        }
+                    }
+                }
+            }
+            return result;
+        }
+
         /// <summary>
         /// 转Int
         /// </summary>

Mall.Module.TradePavilion/CarrierModule.cs

@@ -14,6 +14,7 @@ using RabbitMQ.Client.Framing.Impl;
 using Mall.Model.Extend.Product;
 using RabbitMQ.Client;
 using Mall.Common.Enum.TradePavilion;
+using Mall.Model.Query;
 
 namespace Mall.Module.TradePavilion
 {
@@ -1362,5 +1363,47 @@ namespace Mall.Module.TradePavilion
             return flag;
         }
         #endregion
+
+        /// <summary>
+        /// 获取配置项
+        /// </summary>
+        /// <returns></returns>
+        public object GetYBConfigModule()
+        {
+            List<YBConfigItem> zhuangXiuList = new List<YBConfigItem>();
+            zhuangXiuList.Add(new YBConfigItem() { Name = "清水交付" });
+            zhuangXiuList.Add(new YBConfigItem() { Name = "精装交付" });
+
+            List<YBConfigItem> fukuanList = new List<YBConfigItem>();
+            fukuanList.Add(new YBConfigItem() { Name = "年付" });
+            fukuanList.Add(new YBConfigItem() { Name = "押一付三" });
+            fukuanList.Add(new YBConfigItem() { Name = "押一付一" });
+            fukuanList.Add(new YBConfigItem() { Name = "半年付" });
+
+            List<YBConfigItem> zichanList = new List<YBConfigItem>();
+            zichanList.Add(new YBConfigItem() { Name= "国有资产" });
+            zichanList.Add(new YBConfigItem() { Name = "私企" });
+            zichanList.Add(new YBConfigItem() { Name = "个人" });
+            zichanList.Add(new YBConfigItem() { Name = "其它" });
+
+            List<YBConfigItem> wuyeList = new List<YBConfigItem>();
+            wuyeList.Add(new YBConfigItem() { Name = "开口尺寸" });
+            wuyeList.Add(new YBConfigItem() { Name = "上下水" });
+            wuyeList.Add(new YBConfigItem() { Name = "管径" });
+            wuyeList.Add(new YBConfigItem() { Name = "排污" });
+            wuyeList.Add(new YBConfigItem() { Name = "燃气" });
+            wuyeList.Add(new YBConfigItem() { Name = "电量负荷" });
+            wuyeList.Add(new YBConfigItem() { Name = "排烟量" });
+            wuyeList.Add(new YBConfigItem() { Name = "空调" });
+            wuyeList.Add(new YBConfigItem() { Name = "新风" });
+            object obj = new
+            {
+                zhuangXiuList,
+                fukuanList,
+                zichanList,
+                wuyeList
+            };
+            return obj;
+        }
     }
 }

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -4158,5 +4158,15 @@ namespace Mall.WebApi.Controllers.TradePavilion
 
         }
         #endregion
+
+        /// <summary>
+        /// 获取配置项
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetYBConfig()
+        {
+            var list = carrierModule.GetYBConfigModule();
+            return ApiResult.Success(data: list);
+        }
     }
 }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -4000,6 +4000,20 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 ContactName = parms.GetStringValue("ContactName"),
                 ContactPhone = parms.GetStringValue("ContactPhone"),
             };
+            string PropertyDemandListStr = parms.GetStringValue("PropertyDemandList");
+            List<string> PropertyDemandList = new List<string>();
+            if (!string.IsNullOrEmpty(PropertyDemandListStr))
+            {
+                try
+                {
+                    PropertyDemandList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(PropertyDemandListStr);
+                }
+                catch
+                { 
+                
+                }
+            }
+            model.PropertyDemand = string.Join(",", PropertyDemandList);
             List<string> BannerList = new List<string>();
             string bannerListStr = parms.GetStringValue("BannerList");
             if (!string.IsNullOrEmpty(bannerListStr))
@@ -4056,6 +4070,12 @@ namespace Mall.WebApi.Controllers.TradePavilion
 
                 }
             }
+            List<string> PropertyDemandList = new List<string>();
+            string PropertyDemandStr = extModel?.PropertyDemand ?? "";
+            if (!string.IsNullOrEmpty(PropertyDemandStr))
+            {
+                PropertyDemandList = Common.ConvertHelper.ConvertToListString(PropertyDemandStr);
+            }
             var dataObj = new
             {
                 ID = extModel?.ID ?? 0,
@@ -4076,6 +4096,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 Introduce = extModel?.Introduce ?? "",
                 DevIntention = extModel?.DevIntention ?? "",
                 PropertyDemand = extModel?.PropertyDemand ?? "",
+                PropertyDemandList,
                 Cooperation = extModel?.Cooperation ?? "",
                 Complementary = extModel?.Complementary ?? "",
                 ContactName = extModel?.ContactName ?? "",
@@ -4633,6 +4654,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
         #endregion
         #endregion
 
-
+        /// <summary>
+        /// 获取配置项
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetYBConfig()
+        {
+            var list = carrierModule.GetYBConfigModule();
+            return ApiResult.Success(data: list);
+        }
     }
 }
\ No newline at end of file