From 59e6d61d97070a427dd22aee15d0ae6e84c3527e Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Mon, 3 Jul 2023 13:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E4=BB=93=E6=A0=87=E8=AF=86=E5=91=8A?=
 =?UTF-8?q?=E7=9F=A5=E6=8B=B3=E6=8E=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs          | 3 ++-
 .../PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs   | 5 ++++-
 .../OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs       | 5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
index e1ccf2a2..b5dc0fc7 100644
--- a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
@@ -161,7 +161,8 @@ namespace BBWY.Server.Business
                 {
                     BuyerAccount = createOnlinePurchaseOrderRequest.AppToken,
                     BelongSkus = createOnlinePurchaseOrderRequest.SourceSku,
-                    createOnlinePurchaseOrderRequest.SourceShopName
+                    createOnlinePurchaseOrderRequest.SourceShopName,
+                    createOnlinePurchaseOrderRequest.IntoStoreType
                 })
             };
             var qtResponse = quanTanOrderClient.CreateOrder(quantanCreateOrderRequest, createOnlinePurchaseOrderRequest.AppKey, createOnlinePurchaseOrderRequest.AppSecret);
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index 1c24aa6b..420b60a7 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -14,6 +14,7 @@ using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using Yitter.IdGenerator;
+using static BBWY.Server.Model.Enums;
 
 namespace BBWY.Server.Business
 {
@@ -548,7 +549,8 @@ namespace BBWY.Server.Business
            */
             var loggerName = $"批量采购-{request.ShopName}";
             nLogManager.GetLogger(loggerName).Info(JsonConvert.SerializeObject(request));
-
+            if (request.IntoStoreType == null)
+                request.IntoStoreType = Enums.IntoStoreType.发回齐越;
             if (request.CargoParamGroupList == null || request.CargoParamGroupList.Count() == 0 ||
                  request.CargoParamGroupList.Any(g => g.CargoParamList == null || g.CargoParamList.Count() == 0 || string.IsNullOrEmpty(g.PurchaserId)))
                 throw new BusinessException("缺少商品参数");
@@ -641,6 +643,7 @@ namespace BBWY.Server.Business
                                                                          TradeMode = tradeMode,
                                                                          Extensions = cardId,
                                                                          AutoPay = request.AutoPay,
+                                                                         IntoStoreType = request.IntoStoreType
                                                                      });
 
                     var purchaseOrderSimpleInfo = platformSDKBusinessList.FirstOrDefault(p => p.Platform == purchaseGroup.PurchasePlatform).GetOrderSimpleInfo(new GetOrderInfoRequest()
diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs
index a26ba6e7..e7f04c7b 100644
--- a/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs
@@ -56,5 +56,10 @@
         /// fail 不自动支付   success :自动支付 
         /// </summary>
         public string AutoPay { get; set; }
+
+        /// <summary>
+        /// 入仓类型
+        /// </summary>
+        public Enums.IntoStoreType? IntoStoreType { get; set; }
     }
 }