From cb4d18c8ec3da75e6a7e5ffac17e1cc081eeb867 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Mon, 3 Jul 2023 13:53:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96userId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Server.API/Controllers/BaseApiController.cs           | 7 +++++++
 BBWY.Server.API/Controllers/BatchPurchaseController.cs     | 6 ++++--
 .../PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs | 7 +++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

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);
         }
 
         /// <summary>
@@ -103,7 +105,7 @@ namespace BBWY.Server.API.Controllers
         {
             return batchPurchaseBusiness.CancelPurchaseOrder(request);
         }
-  
+
         /// <summary>
         /// 修改采购单状态
         /// </summary>
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
         /// 创建订单
         /// </summary>
         /// <param name="request"></param>
-        public BatchCreareOrderResponse BatchCreateOrderV2(BatchPurchaseCreateOrderRequestV2 request)
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        /// <exception cref="BusinessException"></exception>
+        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