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

Mall.Model/Extend/TradePavilion/RB_Brand_Extend.cs

@@ -15,7 +15,10 @@ namespace Mall.Model.Extend.TradePavilion
 
         public List<string> BannerList { get; set; }
 
-        public string ProjectName { get; set; }
+        /// <summary>
+        /// 商铺性质
+        /// </summary>
+        public string ProjectName { get { return Common.Plugin.EnumHelper.GetEnumName(this.ProjectType); } }
 
         /// <summary>
         /// 收藏id

Mall.Repository/TradePavilion/RB_BrandRepository.cs

@@ -82,6 +82,15 @@ WHERE 1=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 GetPage<RB_Brand_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -1123,8 +1123,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 extModel.BannerList = new List<string>();
             }
-
-            extModel.ProjectName = (extModel.ProjectType.HasValue && extModel.ProjectType.Value > 0) ? EnumHelper.GetEnumName(extModel.ProjectType) : "";
             if (req.UserId > 0 && extModel.ID > 0)
             {                //判断是否已经关注过
                 var collectModel = carrierModule.GetList(new RB_Collect_Extend { Status = 0, Type = 2, UserId = req.UserId, SourceId = extModel.ID, MallBaseId = query.MallBaseId, TenantId = query.TenantId }).FirstOrDefault();

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -1127,7 +1127,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             }));
         }
 
-
         /// <summary>
         /// 获取品牌分类分页列表
         /// </summary>
@@ -1145,7 +1144,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
             var list = carrierModule.GetBrandClassPageListRepository(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
-
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;
             return ApiResult.Success(data: pageModel);
@@ -1172,7 +1170,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-
         [HttpPost]
         public ApiResult GetBrandClassDetails()
         {
@@ -1204,7 +1201,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 return ApiResult.Failed("请上传Logo");
             }
-
             if (query.ID == 0)
             {
                 query.CreateDate = System.DateTime.Now;
@@ -1217,8 +1213,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
-
-
         /// <summary>
         /// 删除品牌信息
         /// </summary>
@@ -1231,9 +1225,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
-
-
-
         /// <summary>
         /// 获取品牌分页列表
         /// </summary>
@@ -1255,6 +1246,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 Plumbing = parms.GetInt("Plumbing", -1),
                 Caliber = parms.GetInt("Caliber", -1),
                 Sewage = parms.GetInt("Sewage", -1),
+                PaiYan = parms.GetInt("PaiYan", -1),
+                DianLiang = parms.GetStringValue("DianLiang"),
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;

Mall.WebApi/Startup.cs

@@ -129,6 +129,11 @@ namespace Mall.WebApi
             {
                 Timers.TimerJobj.RunStop();  //网站停止完成执行
             });
+            string filePath = Path.Combine(Directory.GetCurrentDirectory(), "upfile");
+            if (System.IO.Directory.Exists(filePath) == false)//如果不存在就创建file文件夹
+            {
+                System.IO.Directory.CreateDirectory(filePath);
+            }
             app.UseStaticFiles(new StaticFileOptions
             {
                 FileProvider = new Microsoft.Extensions.FileProviders.PhysicalFileProvider(

Mall.WebApi/mall_publish.cmd

+@echo off
+    iisreset /STOP
+    dotnet publish E:\Work\Git\Mall_Api\Mall.WebApi\Mall.WebApi.csproj -o E:\publish\Mall.oytour.com -c realease
+    iisreset /START 
+exit
\ No newline at end of file