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;
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.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.Business/SkuOptimization/OptimizationBusiness.cs b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs
index 118d225..907116e 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);
ISelect select = null;
@@ -599,6 +599,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,
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; }
+ }
+}