From 999065350f2e21de18b87d3afa885c44e4cbd500 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sat, 16 Mar 2024 02:50:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWYB.Server.API/Controllers/SkuOptimizationController.cs | 4 +++- .../SkuOptimization/OptimizationBusiness.cs | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/BBWYB.Server.API/Controllers/SkuOptimizationController.cs b/BBWYB.Server.API/Controllers/SkuOptimizationController.cs index e8919ce..884c651 100644 --- a/BBWYB.Server.API/Controllers/SkuOptimizationController.cs +++ b/BBWYB.Server.API/Controllers/SkuOptimizationController.cs @@ -1,10 +1,12 @@ using BBWYB.Server.Business; using BBWYB.Server.Model.Dto; +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; namespace BBWYB.Server.API.Controllers { - + [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)] public class SkuOptimizationController : BaseApiController { private OptimizationBusiness optimizationBusiness; diff --git a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs index 80915c9..b49b4c7 100644 --- a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs +++ b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs @@ -554,6 +554,8 @@ namespace BBWYB.Server.Business .Count(out var total) .Page(request.PageIndex, request.PageSize) .ToList(); + if (taskList.Count() == 0) + return new ListResponse() { TotalCount = 0, Items = null }; var spuTaskIdList = taskList.Select(t => t.Id).ToList(); @@ -589,6 +591,12 @@ namespace BBWYB.Server.Business #endregion #region 获取采购方案 + if (skuIdList.Count() == 0 && bargainTeamIdList.Count() == 0) + return new ListResponse() + { + Items = null, + TotalCount = 0 + }; var purchaseSchemeList = purchaseSchemeBusiness.GetPurchaseSchemeList(new QuerySchemeRequest() { SkuIdList = skuIdList, From d85e2db0df4cfc55f111b2623f3911e9141e3bca Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sat, 16 Mar 2024 02:53:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Authorize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWYB.Server.API/Controllers/PurchaserController.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BBWYB.Server.API/Controllers/PurchaserController.cs b/BBWYB.Server.API/Controllers/PurchaserController.cs index 0bc88a4..5ebec9d 100644 --- a/BBWYB.Server.API/Controllers/PurchaserController.cs +++ b/BBWYB.Server.API/Controllers/PurchaserController.cs @@ -1,10 +1,13 @@ using BBWYB.Server.Business; using BBWYB.Server.Model.Db; using BBWYB.Server.Model.Dto; +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; namespace BBWYB.Server.API.Controllers { + [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)] public class PurchaserController : BaseApiController { private PurchaserBusiness purchaserBusiness; From bd913f5a6c757423ce44b9d823878e68a209de5e Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sat, 16 Mar 2024 03:02:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs index b49b4c7..74ce309 100644 --- a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs +++ b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs @@ -539,7 +539,7 @@ namespace BBWYB.Server.Business /// public ListResponse GetNoCompletionSkuOptimizationTask(QueryNoCompletionOptimizationTaskRequest request, string userId) { - request.EndTime = request.EndTime.Date; + request.EndTime = request.EndTime.Date.AddDays(1).AddSeconds(-1); var uInfo = userBusiness.GetisBargainTeamByUserId(userId, true); var taskList = fsql.Select() .Where(t => t.IsOptimizationCompleted == false && From ede3ffa02fd2793720c8e6d4d426500432d58722 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sat, 16 Mar 2024 20:39:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWYB.Server.API/Controllers/VenderController.cs | 12 ++++++++++++ .../Dto/Request/Vender/QueryShopRequest.cs | 9 +++++++++ 2 files changed, 21 insertions(+) create mode 100644 BBWYB.Server.Model/Dto/Request/Vender/QueryShopRequest.cs diff --git a/BBWYB.Server.API/Controllers/VenderController.cs b/BBWYB.Server.API/Controllers/VenderController.cs index 87825cf..2e74620 100644 --- a/BBWYB.Server.API/Controllers/VenderController.cs +++ b/BBWYB.Server.API/Controllers/VenderController.cs @@ -1,4 +1,5 @@ using BBWYB.Server.Business; +using BBWYB.Server.Model; using BBWYB.Server.Model.Db.MDS; using BBWYB.Server.Model.Dto; using Microsoft.AspNetCore.Authentication.JwtBearer; @@ -69,5 +70,16 @@ namespace BBWYB.Server.API.Controllers { return venderBusiness.GetKuaiDi100ExpressCompanyList(request); } + + /// + /// 获取店铺列表 + /// + /// + /// + [HttpPost] + public IList GetShopList([FromBody] QueryShopRequest request) + { + return venderBusiness.GetShopList(request.ShopId, request.Platform); + } } } diff --git a/BBWYB.Server.Model/Dto/Request/Vender/QueryShopRequest.cs b/BBWYB.Server.Model/Dto/Request/Vender/QueryShopRequest.cs new file mode 100644 index 0000000..a432cd3 --- /dev/null +++ b/BBWYB.Server.Model/Dto/Request/Vender/QueryShopRequest.cs @@ -0,0 +1,9 @@ +namespace BBWYB.Server.Model.Dto +{ + public class QueryShopRequest + { + public long? ShopId { get; set; } + + public Enums.Platform? Platform { get; set; } + } +}