提交代码

Mall.Model/Extend/TradePavilion/RB_Brand_Extend.cs

@@ -14,5 +14,7 @@ namespace Mall.Model.Extend.TradePavilion
 
 
         public List<string> BannerList { get; set; }
+
+        public string ProjectName { get; set; }
     }
 }

Mall.Module.TradePavilion/CompanyModule.cs

@@ -116,7 +116,32 @@ namespace Mall.Module.TradePavilion
         /// <returns></returns>
         public RB_Company_Extend GetCompanyByUserIdModule(int userId)
         {
-            return companyRepository.GetCompanyRepository(new RB_Company_Extend() { CreateBy = userId });
+            var model =companyRepository.GetCompanyRepository(new RB_Company_Extend() { CreateBy = userId });
+            if (model != null && model.CompanyId > 0)
+            {
+                var metroList = brandRepository.GetBrandList(new RB_CompanyBrand_Extend { TenantId = model.TenantId, MallBaseId = model.MallBaseId, CompanyId = model.CompanyId });
+                if (metroList != null && metroList.Any())
+                {
+                    model.BrandModel = new RB_CompanyBrand_Extend();
+                    model.BrandModel = metroList.FirstOrDefault();
+                    if (model.BrandModel != null && !string.IsNullOrWhiteSpace(model.BrandModel.CustomerType))
+                    {
+                        model.BrandModel.CustomerTypeInfo = new List<string>();
+                        foreach (var itemCustomerType in model.BrandModel.CustomerType.Split(","))
+                        {
+                            if (itemCustomerType != "5")
+                            {
+                                model.BrandModel.CustomerTypeInfo.Add(Common.Plugin.EnumHelper.GetEnumName(itemCustomerType));
+                            }
+                            else
+                            {
+                                model.BrandModel.CustomerTypeInfo.Add(model.BrandModel.CustomerOtherType);
+                            }
+                        }
+                    }
+                }
+            }
+            return model;
         }
 
         /// <summary>

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -77,6 +77,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 新增修改公司信息
         /// </summary>
         /// <returns></returns>
+        [HttpPost]
         public ApiResult SetCompany()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
@@ -131,6 +132,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 获取当前用户的公司信息实体
         /// </summary>
         /// <returns></returns>
+        [HttpPost]
         public ApiResult GetUserCompany()
         {
             var userInfo = AppletUserInfo;
@@ -552,11 +554,12 @@ namespace Mall.WebApi.Controllers.TradePavilion
         #endregion
 
 
-        #region 品牌
+        #region 公司品牌
         /// <summary>
         /// 新增修改品牌信息
         /// </summary>
         /// <returns></returns>
+        [HttpPost]
         public ApiResult SetBrand()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
@@ -609,6 +612,20 @@ namespace Mall.WebApi.Controllers.TradePavilion
         }
 
 
+        /// <summary>
+        /// 获取当前用户的公司品牌信息实体
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserCompanyBrand()
+        {
+            var userInfo = AppletUserInfo;
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var CompanyId = parms.GetInt("CompanyId", 0);
+            var model = carrierModule.GetBrandRepository(new RB_CompanyBrand_Extend { TenantId= userInfo .TenantId,MallBaseId= userInfo .MallBaseId,CompanyId= CompanyId });
+            return ApiResult.Success(data: model);
+        }
+
 
         /// <summary>
         /// 获取客户群体枚举
@@ -643,5 +660,102 @@ namespace Mall.WebApi.Controllers.TradePavilion
         }
 
         #endregion
+
+
+        #region 品牌
+        /// <summary>
+        /// 获取品牌分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetBrandPageList()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Brand_Extend()
+            {
+                BrandName = parms.GetStringValue("BrandName"),
+                ProjectType = (Common.Enum.TradePavilion.ProjectTypeEnum)parms.GetInt("ProjectType", 0),
+                BrandClassId = parms.GetInt("BrandClassId", 0),
+                RanQi = parms.GetInt("RanQi", -1),
+                KongTiao = parms.GetInt("KongTiao", -1),
+                XinFeng = parms.GetInt("XinFeng", -1),
+                Plumbing = parms.GetInt("Plumbing", -1),
+                Caliber = parms.GetInt("Caliber", -1),
+                Sewage = parms.GetInt("Sewage", -1),
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            foreach (var item in list)
+            {
+                if (!string.IsNullOrWhiteSpace(item.Banner))
+                {
+                    item.BannerList = JsonConvert.DeserializeObject<List<string>>(item.Banner);
+                }
+                else
+                {
+                    item.BannerList = new List<string>();
+                }
+            }
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+
+
+        /// <summary>
+        /// 获取品牌实体
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetBrandDetails()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Brand_Extend()
+            {
+                ID = parms.GetInt("ID", 0),
+
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var extModel = carrierModule.GetBrand(query);
+
+            if (!string.IsNullOrWhiteSpace(extModel.Banner))
+            {
+                extModel.BannerList = JsonConvert.DeserializeObject<List<string>>(extModel.Banner);
+            }
+            else
+            {
+                extModel.BannerList = new List<string>();
+            }
+
+            extModel.ProjectName = (extModel.ProjectType.HasValue && extModel.ProjectType.Value > 0) ? EnumHelper.GetEnumName(extModel.ProjectType):"";
+
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 获取品牌分类分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetBrandClassList()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_BrandClass_Extend();
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = carrierModule.GetBrandClassList(query);
+            return ApiResult.Success(data: list);
+        }
+        #endregion
     }
 }

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -840,6 +840,25 @@ namespace Mall.WebApi.Controllers.TradePavilion
 
 
         #region 品牌管理
+
+
+        /// <summary>
+        /// 获取商品性质枚举
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetProjectTypeEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.ProjectTypeEnum));
+            return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
+            {
+                Name = x.Key,
+                Id = Convert.ToInt32(x.Value)
+            }));
+        }
+
+
         /// <summary>
         /// 获取品牌分类分页列表
         /// </summary>
@@ -863,6 +882,21 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: pageModel);
         }
 
+        /// <summary>
+        /// 获取品牌分类分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        public ApiResult GetBrandClassList()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_BrandClass_Extend() ;
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = carrierModule.GetBrandClassList( query);
+            return ApiResult.Success(data: list);
+        }
 
         /// <summary>
         /// 获取品牌分类实体
@@ -1058,6 +1092,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var flag = carrierModule.RemoveBrandModule(CarrierId);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
+
+
+
         #endregion
     }
 }