diff --git a/BBWY.Server.API/Controllers/BaseApiController.cs b/BBWY.Server.API/Controllers/BaseApiController.cs index 85263cd3..12fb41af 100644 --- a/BBWY.Server.API/Controllers/BaseApiController.cs +++ b/BBWY.Server.API/Controllers/BaseApiController.cs @@ -1,5 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Http; +using System.Linq; + namespace BBWY.Server.API.Controllers { [Produces("application/json")] @@ -12,5 +14,10 @@ namespace BBWY.Server.API.Controllers { this.httpContextAccessor = httpContextAccessor; } + + protected string GetUserId() + { + return httpContextAccessor?.HttpContext?.User.Claims.Where(x => x.Type == "userId")?.FirstOrDefault()?.Value; + } } } diff --git a/BBWY.Server.API/Controllers/BatchPurchaseController.cs b/BBWY.Server.API/Controllers/BatchPurchaseController.cs index 508217b3..631d3da1 100644 --- a/BBWY.Server.API/Controllers/BatchPurchaseController.cs +++ b/BBWY.Server.API/Controllers/BatchPurchaseController.cs @@ -1,5 +1,6 @@ using BBWY.Server.Business; using BBWY.Server.Model.Dto; +using Jd.Api.Request; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -68,7 +69,8 @@ namespace BBWY.Server.API.Controllers [HttpPost] public BatchCreareOrderResponse BatchCreateOrderV2(BatchPurchaseCreateOrderRequestV2 request) { - return batchPurchaseBusiness.BatchCreateOrderV2(request); + var userId = GetUserId(); + return batchPurchaseBusiness.BatchCreateOrderV2(request, userId); } /// @@ -103,7 +105,7 @@ namespace BBWY.Server.API.Controllers { return batchPurchaseBusiness.CancelPurchaseOrder(request); } - + /// /// 修改采购单状态 /// diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs index aeadb2a6..3c9f474b 100644 --- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs +++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs @@ -542,7 +542,10 @@ namespace BBWY.Server.Business /// 创建订单 /// /// - public BatchCreareOrderResponse BatchCreateOrderV2(BatchPurchaseCreateOrderRequestV2 request) + /// + /// + /// + public BatchCreareOrderResponse BatchCreateOrderV2(BatchPurchaseCreateOrderRequestV2 request,string userId) { /* 下单日志 @@ -752,7 +755,7 @@ namespace BBWY.Server.Business shopId = purchaseGroup.PurchaserId, //拳探店铺Id(商家Id) originShopId = request.ShopId.ToString(), originShopName = request.ShopName, - userId = "", //待定 + userId, //待定 //userName = purchaseAccount.AccountName, platform = Enums.Platform.拳探, purchaseTaskModels