From 3dfc0febcedee3f3b89967796157b95a792109ca Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Fri, 16 Jun 2023 21:30:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E5=A2=9E=E5=8A=A0Or?=
 =?UTF-8?q?derSn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs        | 2 ++
 .../PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs | 7 +++++--
 BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs      | 6 ++++++
 .../OnlinePurchase/CreateOnlinePurchaseOrderResponse.cs    | 5 +++++
 .../OnlinePurchase/OnlinePurchaseOrderSimpleResponse.cs    | 5 +++++
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
index 40f33bc5..e1ccf2a2 100644
--- a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
@@ -176,6 +176,7 @@ namespace BBWY.Server.Business
             return new CreateOnlinePurchaseOrderResponse()
             {
                 PurchaseOrderId = qtResponse.Data.OrderId,
+                Sn = qtResponse.Data.OrderSn,
                 IsPay = payStatus == "success"
             };
         }
@@ -192,6 +193,7 @@ namespace BBWY.Server.Business
             return new OnlinePurchaseOrderSimpleResponse()
             {
                 PurchaseOrderId = getOrderInfoRequest.OrderId,
+                Sn = qtResponse.Data.OrderSn,
                 FreightAmount = qtResponse.Data.TotalPostage,
                 ProductAmount = qtResponse.Data.ProductPrice,
                 TotalAmount = qtResponse.Data.TotalPrice,
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index 87178fea..e7c4df88 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -447,6 +447,7 @@ namespace BBWY.Server.Business
                     var purchaseOrderV2 = new PurchaseOrderV2()
                     {
                         Id = createOrderResponse.PurchaseOrderId,
+                        OrderSn = createOrderResponse.Sn,
                         ShopId = request.ShopId,
                         OrderState = createOrderResponse.IsPay ? Enums.PurchaseOrderState.等待采购 : Enums.PurchaseOrderState.待付款,
                         PurchasePlatform = purchasePlatform,
@@ -711,6 +712,7 @@ namespace BBWY.Server.Business
                     var purchaseOrderV2 = new PurchaseOrderV2()
                     {
                         Id = createOrderResponse.PurchaseOrderId,
+                        OrderSn = createOrderResponse.Sn,
                         ShopId = request.ShopId,
                         OrderState = createOrderResponse.IsPay ? Enums.PurchaseOrderState.等待采购 : Enums.PurchaseOrderState.待付款,
                         PurchasePlatform = purchaseGroup.PurchasePlatform,
@@ -837,8 +839,8 @@ namespace BBWY.Server.Business
                                         request.PurchaseOrderState == Enums.PurchaseOrderState.待完结 ||
                                         request.PurchaseOrderState == Enums.PurchaseOrderState.已完成 ||
                                         request.PurchaseOrderState == Enums.PurchaseOrderState.已取消,
-                                        (po,pa) => po.OrderState == request.PurchaseOrderState)
-                               .WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.等待采购, (po,pa) => po.OrderState == Enums.PurchaseOrderState.等待采购 ||
+                                        (po, pa) => po.OrderState == request.PurchaseOrderState)
+                               .WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.等待采购, (po, pa) => po.OrderState == Enums.PurchaseOrderState.等待采购 ||
                                                                                                           po.OrderState == Enums.PurchaseOrderState.部分采购)
                                .WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.待发货, (po, pa) => po.OrderState == Enums.PurchaseOrderState.待发货 ||
                                                                                                         po.OrderState == Enums.PurchaseOrderState.部分发货)
@@ -854,6 +856,7 @@ namespace BBWY.Server.Business
                                           .ToList((po, pa) => new PurchaseOrderV2Response
                                           {
                                               Id = po.Id,
+                                              OrderSn = po.OrderSn,
                                               ShopId = po.ShopId,
                                               OrderState = po.OrderState,
                                               PurchasePlatform = po.PurchasePlatform,
diff --git a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
index 1d9d6210..0f69e9dc 100644
--- a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
+++ b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
@@ -18,6 +18,12 @@ namespace BBWY.Server.Model.Db
         [Column(StringLength = 100, IsPrimary = true, IsNullable = false)]
         public string Id { get; set; }
 
+        /// <summary>
+        /// 拳探订单独有Sn号
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string OrderSn { get; set; }
+
         /// <summary>
         /// 完成时间
         /// </summary>
diff --git a/BBWY.Server.Model/Dto/Response/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderResponse.cs b/BBWY.Server.Model/Dto/Response/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderResponse.cs
index 4e60cdd1..a44c0c63 100644
--- a/BBWY.Server.Model/Dto/Response/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderResponse.cs
@@ -7,6 +7,11 @@ namespace BBWY.Server.Model.Dto
 
         public string PurchaseOrderId { get; set; }
 
+        /// <summary>
+        /// 拳探订单独有
+        /// </summary>
+        public string Sn { get; set; }
+
         /// <summary>
         /// 订单总额
         /// </summary>
diff --git a/BBWY.Server.Model/Dto/Response/PurchaseOrder/OnlinePurchase/OnlinePurchaseOrderSimpleResponse.cs b/BBWY.Server.Model/Dto/Response/PurchaseOrder/OnlinePurchase/OnlinePurchaseOrderSimpleResponse.cs
index 18174a0f..e49fe4df 100644
--- a/BBWY.Server.Model/Dto/Response/PurchaseOrder/OnlinePurchase/OnlinePurchaseOrderSimpleResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/PurchaseOrder/OnlinePurchase/OnlinePurchaseOrderSimpleResponse.cs
@@ -12,6 +12,11 @@ namespace BBWY.Server.Model.Dto
         /// </summary>
         public string PurchaseOrderId { get; set; }
 
+        /// <summary>
+        /// 拳探独有
+        /// </summary>
+        public string Sn { get; set; }
+
         /// <summary>
         /// 订单总额
         /// </summary>