From 0674c5f826b07999a76a6b733f25a9d08f422dcb Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 18 Jul 2023 17:06:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=87=87=E8=B4=AD=E5=95=86Id?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseOrder/PurchaseOrderBusiness.cs                | 2 +-
 .../PurchaseScheme/PurchaseProductAPIService.cs           | 1 +
 .../PurchaseScheme/PurchaseSchemeBusiness.cs              | 2 ++
 BBWYB.Server.Model/Db/PurchaseScheme/Purchaser.cs         | 8 +++++++-
 .../Request/PurchaseScheme/InputPurchaseSchemeRequest.cs  | 6 ++++++
 .../Dto/Response/PurchaseScheme/PurchaseSchemeResponse.cs | 2 ++
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 8c130eb..6bade0a 100644
--- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -1038,7 +1038,7 @@ namespace BBWYB.Server.Business
             purchaserId = purchaserId.Replace("b2b-", string.Empty);
             var purchaserId2 = purchaserId.Substring(0, purchaserId.Length - 5);
             var purchaserIds = new List<string>() { purchaserId, purchaserId2 };
-            var dbPurchaser = fsql.Select<Purchaser>().Where(p => p.Platform == Enums.Platform.阿里巴巴 && purchaserIds.Contains(p.Id)).ToOne();
+            var dbPurchaser = fsql.Select<Purchaser>().Where(p => p.Platform == Enums.Platform.阿里巴巴 && (purchaserIds.Contains(p.Id) || purchaserIds.Contains(p.Id2))).ToOne();
             if (dbPurchaser == null)
                 throw new BusinessException($"采购单{request.PurchaseOrderId}缺少有效采购商");
             purchaserId = dbPurchaser.Id;
diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseProductAPIService.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseProductAPIService.cs
index 9fa4e91..0995f7f 100644
--- a/BBWYB.Server.Business/PurchaseScheme/PurchaseProductAPIService.cs
+++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseProductAPIService.cs
@@ -197,6 +197,7 @@ namespace BBWYB.Server.Business
                 var purchaser = new Purchaser()
                 {
                     Id = jobject["globalData"]["tempModel"]["sellerUserId"].ToString(),
+                    Id2 = jobject["globalData"]["tempModel"]["sellerLoginId"]?.ToString(),
                     Name = jobject["globalData"]["tempModel"]["companyName"].ToString(),
                     Location = jobject["data"]["1081181309101"] != null ?
                                jobject["data"]["1081181309101"]["data"]["location"].ToString() :
diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index 54d8390..2347173 100644
--- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -30,6 +30,7 @@ namespace BBWYB.Server.Business
                     addPurchaserList.Add(new Purchaser()
                     {
                         Id = scheme.PurchaserId,
+                        Id2 = scheme.PurchaserId2,
                         Name = scheme.PurchaserName,
                         Location = scheme.PurchaserLocation,
                         Platform = scheme.PurchasePlatform
@@ -163,6 +164,7 @@ namespace BBWYB.Server.Business
                 SkuId = ps.SkuId,
                 ShopId = ps.ShopId,
                 PurchaserId = p.Id,
+                PurchaserId2 = p.Id2,
                 PurchaserName = p.Name,
                 PurchaserLocation = p.Location,
                 DefaultCost = ps.DefaultCost,
diff --git a/BBWYB.Server.Model/Db/PurchaseScheme/Purchaser.cs b/BBWYB.Server.Model/Db/PurchaseScheme/Purchaser.cs
index 6833df3..d04021f 100644
--- a/BBWYB.Server.Model/Db/PurchaseScheme/Purchaser.cs
+++ b/BBWYB.Server.Model/Db/PurchaseScheme/Purchaser.cs
@@ -11,11 +11,17 @@ namespace BBWYB.Server.Model.Db
     {
 
         /// <summary>
-        /// 采购商Id
+        /// 采购商Id (1688 SellerUserId)
         /// </summary>
         [Column(StringLength = 20, IsPrimary = true, IsNullable = false)]
         public string Id { get; set; }
 
+        /// <summary>
+        /// 采购商Id2 (1688 SellerLoginId)
+        /// </summary>
+        [Column(StringLength = 20)]
+        public string Id2 { get; set; }
+
         /// <summary>
         /// 采购商名称
         /// </summary>
diff --git a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs
index 6d07002..fda1121 100644
--- a/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs
+++ b/BBWYB.Server.Model/Dto/Request/PurchaseScheme/InputPurchaseSchemeRequest.cs
@@ -19,6 +19,12 @@ namespace BBWYB.Server.Model.Dto
         /// 采购商Id
         /// </summary>
         public string PurchaserId { get; set; }
+
+        /// <summary>
+        /// 采购商Id
+        /// </summary>
+        public string PurchaserId2 { get; set; }
+
         /// <summary>
         /// 采购商名称
         /// </summary>
diff --git a/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeResponse.cs b/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeResponse.cs
index 30bbb75..f322e0a 100644
--- a/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/PurchaseScheme/PurchaseSchemeResponse.cs
@@ -8,6 +8,8 @@ namespace BBWYB.Server.Model.Dto
     {
         public string PurchaserName { get; set; }
 
+        public string PurchaserId2 { get; set; }
+
         public string PurchaserLocation { get; set; }
 
         public new List<PurchaseSchemeProductResponse> PurchaseSchemeProductList { get; set; }