提交代码

Mall.Common/Enum/TradePavilion/BusinessExportEnum.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Plugin;
+
+namespace Mall.Common.Enum.TradePavilion
+{
+    /// <summary>
+    /// 品牌下载枚举列表
+    /// </summary>
+    public enum BusinessExportEnum
+    {
+        /// <summary>
+        /// 品牌分类
+        /// </summary>
+        [EnumField("品牌分类")]
+        ClassName = 1,
+        /// <summary>
+        /// 品牌全名
+        /// </summary>
+        [EnumField("品牌全名")]
+        FullBrandName = 2,
+        /// <summary>
+        /// 品牌名
+        /// </summary>
+        [EnumField("品牌名")]
+        BrandName = 3,
+        /// <summary>
+        /// 品牌视频
+        /// </summary>
+        [EnumField("品牌视频")]
+        VideoUrl = 4,
+        /// <summary>
+        /// 店铺数量
+        /// </summary>
+        [EnumField("店铺数量")]
+        ShopNum = 5,
+        /// <summary>
+        /// 建筑面积
+        /// </summary>
+        [EnumField("建筑面积")]
+        BuiltUpArea = 6,
+        /// <summary>
+        /// 需求面积
+        /// </summary>
+        [EnumField("需求面积")]
+        AreaRequirement = 7,
+        /// <summary>
+        /// 客群定位
+        /// </summary>
+        [EnumField("客群定位")]
+        CustomerType = 8,
+        /// <summary>
+        /// 品牌定位
+        /// </summary>
+        [EnumField("品牌定位")]
+        BrandType = 9,
+        /// <summary>
+        /// 拓店区域
+        /// </summary>
+        [EnumField("拓店区域")]
+        StoreExpansion = 10,
+        /// <summary>
+        /// 商铺性质
+        /// </summary>
+        [EnumField("商铺性质")]
+        ProjectType = 11,
+        /// <summary>
+        /// 店铺开口尺寸
+        /// </summary>
+        [EnumField("店铺开口尺寸")]
+        IsShopSize = 12,
+        /// <summary>
+        /// 燃气
+        /// </summary>
+        [EnumField("燃气")]
+        RanQi = 13,
+        /// <summary>
+        /// 排烟量
+        /// </summary>
+        [EnumField("排烟量")]
+        PaiYan = 14,
+        /// <summary>
+        /// 电量
+        /// </summary>
+        [EnumField("电量")]
+        IsDianLiang = 15,
+        /// <summary>
+        /// 上下水
+        /// </summary>
+        [EnumField("上下水")]
+        Plumbing = 16,
+        /// <summary>
+        /// 管径
+        /// </summary>
+        [EnumField("管径")]
+        Caliber = 17,
+        /// <summary>
+        /// 排污
+        /// </summary>
+        [EnumField("排污")]
+        Sewage = 18,
+        /// <summary>
+        /// 空调
+        /// </summary>
+        [EnumField("空调")]
+        KongTiao = 19,
+        /// <summary>
+        /// 新风
+        /// </summary>
+        [EnumField("新风")]
+        XinFeng = 20,
+        /// <summary>
+        /// 广告
+        /// </summary>
+        [EnumField("广告")]
+        Advertising = 21,
+        /// <summary>
+        /// 其他
+        /// </summary>
+        [EnumField("其他")]
+        Other = 22,
+        /// <summary>
+        /// Logo
+        /// </summary>
+        [EnumField("Logo")]
+        Logo = 23,
+    }
+}

Mall.Model/Extend/TradePavilion/RB_Brand_Extend.cs

@@ -27,5 +27,10 @@ namespace Mall.Model.Extend.TradePavilion
         /// 收藏id
         /// </summary>
         public int CollectId { get; set; }
+
+        /// <summary>
+        /// 导出枚举ids
+        /// </summary>
+        public List<int> ExcelEnumIds { get; set; }
     }
 }

Mall.Repository/TradePavilion/RB_BrandRepository.cs

@@ -137,6 +137,11 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.BrandClassId), query.BrandClassId);
                 }
+                if (query.ProjectType.HasValue && query.ProjectType > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.ProjectType), (int)query.ProjectType);
+                }
+               
             }
             return Get<RB_Brand_Extend>(builder.ToString(), parameters).FirstOrDefault();
         }
@@ -167,10 +172,6 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.TenantId), query.TenantId);
                 }
-                if (query.ID > 0)
-                {
-                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.ID), query.ID);
-                }
                 if (query.MallBaseId > 0)
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.MallBaseId), query.MallBaseId);
@@ -184,6 +185,44 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.BrandClassId), query.BrandClassId);
                 }
+                if (query.ProjectType.HasValue && query.ProjectType > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.ProjectType), (int)query.ProjectType);
+                }
+
+                if (query.RanQi > -1)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.RanQi), query.RanQi);
+                }
+                if (query.KongTiao > -1)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.KongTiao), query.KongTiao);
+                }
+                if (query.XinFeng > -1)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.XinFeng), query.XinFeng);
+                }
+                if (query.Plumbing > -1)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.Plumbing), query.Plumbing);
+                }
+                if (query.Caliber > -1)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.Caliber), query.Caliber);
+                }
+                if (query.Sewage > -1)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.Sewage), query.Sewage);
+                }
+                if (query.PaiYan > -1)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.PaiYan), query.PaiYan);
+                }
+                if (!string.IsNullOrEmpty(query.DianLiang))
+                {
+                    builder.AppendFormat(" AND a.{0} LIKE @DianLiang ", nameof(RB_Brand_Extend.DianLiang));
+                    parameters.Add("DianLiang", "%" + query.DianLiang.Trim() + "%");
+                }
             }
             return Get<RB_Brand_Extend>(builder.ToString(), parameters).ToList();
         }

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -871,7 +871,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 {
                     item.BannerList = JsonConvert.DeserializeObject<List<string>>(item.Banner);
                 }
-                else {
+                else
+                {
                     item.BannerList = new List<string>();
                 }
             }
@@ -1134,7 +1135,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
-
+            query.RanQi = -1;
+            query.KongTiao = -1;
+            query.XinFeng = -1;
+            query.Plumbing = -1;
+            query.Caliber = -1;
+            query.PaiYan = -1;
+            query.Sewage = -1;
             var extModel = carrierModule.GetBrand(query);
 
             if (!string.IsNullOrWhiteSpace(extModel.Banner))
@@ -1171,6 +1178,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var list = carrierModule.GetBrandClassList(query);
             return ApiResult.Success(data: list);
         }
+
+
+
         #endregion
 
         #region 关注
@@ -1186,9 +1196,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
             JObject jobj = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_Collect_Extend()
             {
-                Id=jobj.GetInt("Id"),
-                Type=jobj.GetInt("Type"),
-                SourceId=jobj.GetInt("SourceId"),
+                Id = jobj.GetInt("Id"),
+                Type = jobj.GetInt("Type"),
+                SourceId = jobj.GetInt("SourceId"),
             };
             query.TenantId = userInfo.TenantId;
             query.MallBaseId = userInfo.MallBaseId;