首店接口调整

Mall.Common/Enum/TradePavilion/BrandCategoryEnum.cs

@@ -11,26 +11,26 @@ namespace Mall.Common.Enum.TradePavilion
         /// 商业载体
         /// </summary>
         [EnumField("商业载体")]
-        Business = 1,
+        ZaiTi = 1,
 
         /// <summary>
         /// 活力楼宇
         /// </summary>
         [EnumField("楼宇")]
-        VitalityBuilding = 2,
+        LouYu = 2,
 
 
         /// <summary>
         /// 消费品牌
         /// </summary>
         [EnumField("消费品牌")]
-        ConsumerBrand = 3,
+        PinPai = 3,
 
 
         /// <summary>
         /// 企业服务
         /// </summary>
         [EnumField("企业服务")]
-        EnterpriseServices = 4,
+        QiYeFuWu = 4,
     }
 }

Mall.Repository/TradePavilion/RB_BrandRepository.cs

@@ -19,7 +19,7 @@ namespace Mall.Repository.TradePavilion
         /// <param name="rowsCount"></param>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_Brand_Extend> GetBrandPageList(int pageIndex, int pageSize, out long rowsCount, RB_Brand_Extend query)
+        public List<RB_Brand_Extend> GetBrandPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Brand_Extend query)
         {
             rowsCount = 0;
             DynamicParameters parameters = new DynamicParameters();
@@ -59,7 +59,7 @@ WHERE 1=1
                 }
                 if (query.BrandClassId > 0)
                 {
-                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.BrandClassId), query.BrandClassId);
+                    builder.AppendFormat(" AND (a.{0}={2} OR FIND_IN_SET('{2}',a.{1}) > 0 ", nameof(RB_Brand_Extend.BrandClassId), nameof(RB_Brand_Extend.MoreBrandClassId), query.BrandClassId);
                 }
                 if (query.ProjectType.HasValue && query.ProjectType > 0)
                 {

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -6,8 +6,8 @@ using Mall.Common.Enum.Goods;
 using Mall.Common.Enum.TradePavilion;
 using Mall.Common.Enum.User;
 using Mall.Common.Plugin;
-using Mall.Model.Entity.TradePavilion;
 using Mall.Model.Extend.TradePavilion;
+using Mall.Model.Query;
 using Mall.Module.TradePavilion;
 using Mall.WebApi.Filter;
 using Microsoft.AspNetCore.Authorization;
@@ -15,16 +15,9 @@ using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Org.BouncyCastle.Ocsp;
-using RabbitMQ.Client.Framing.Impl;
-using Senparc.Weixin.Annotations;
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.ComponentModel.Design;
-using System.Drawing;
 using System.Linq;
-using System.Reflection;
 
 namespace Mall.WebApi.Controllers.TradePavilion
 {
@@ -2056,7 +2049,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
-            var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            var list = carrierModule.GetBrandPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
             List<RB_FirstShop_ListEnroll_Extend> listEnroll = new List<RB_FirstShop_ListEnroll_Extend>();
             if (list != null && list.Any())
             {
@@ -2166,7 +2159,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         }
 
         /// <summary>
-        /// 获取品牌分类分页列表
+        /// 获取品牌分类列表
         /// </summary>
         /// <returns></returns>
         [HttpGet]
@@ -2187,13 +2180,34 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 int BrandCategory = parms.GetInt("BrandCategory");
                 if (BrandCategory == 0)
                 {
-                    query.BrandCategory = BrandCategoryEnum.ConsumerBrand;
+                    query.BrandCategory = BrandCategoryEnum.PinPai;
                 }
             }
             var list = carrierModule.GetBrandClassListModule(query);
             return ApiResult.Success(data: list);
         }
 
+        /// <summary>
+        /// 获取品牌分类树形列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
+        public ApiResult GetBrandClassTreeList()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_BrandClass_Extend
+            {
+                MallBaseId = RequestParm.MallBaseId,
+                TenantId = RequestParm.TenantId,
+                BrandCategory = (BrandCategoryEnum)parms.GetInt("BrandCategory"),
+            };
+            var list = carrierModule.GetBrandClassTreeModule(query);
+            return ApiResult.Success(data: list);
+        }
+
         #region 奖章
         [HttpPost]
         [AllowAnonymous]
@@ -4323,6 +4337,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: pageModel);
         }
         #endregion
+
         /// <summary>
         /// 获取配置项
         /// </summary>
@@ -4337,7 +4352,31 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: list);
         }
 
-
-
+        /// <summary>
+        /// 获取配置项
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        [RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
+        public ApiResult GetTradeIndexData()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            ResultPageModel pageModel = new ResultPageModel()
+            {
+                pageIndex = parms.GetInt("pageIndex"),
+                pageSize = parms.GetInt("pageSize")
+            };
+            TradeIndexQuery query = new TradeIndexQuery()
+            {
+                qType = parms.GetInt("qType"),
+                MallBaseId = RequestParm.MallBaseId
+            };
+            var dataList = carrierModule.GetTradeIndexDataModule(pageModel.pageIndex, pageModel.pageSize, query, out long rowsCount);
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = dataList;
+            return ApiResult.Success(data: pageModel);
+        }
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -1975,7 +1975,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.TenantId = RequestParm.TenantId;
             List<object> list = new List<object>();
            
-            var dataList = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query, true);
+            var dataList = carrierModule.GetBrandPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query, true);
             foreach (var item in dataList)
             {
                 item.ProjectName = item.ProjectType.GetEnumName();