From a3cff2c0b943988abc536af7dd4ce4bf6dc897f5 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 16 Mar 2022 11:00:00 +0800
Subject: [PATCH] chu li hui iao

---
 BBWY.Client/APIServices/PurchaseOrderService.cs          | 4 ++++
 .../ViewModels/Purchase/1688PreviewPurchaseViewModel.cs  | 1 +
 BBWY.Client/Views/Order/RelationPurchaseOrder.xaml       | 5 ++---
 .../PurchaseOrder/PurchaseOrderBusiness.cs               | 9 +++++++--
 BBWY.Server.Model/Db/Order/OrderDropShipping.cs          | 5 +++++
 BBWY.Server.Model/Db/PurchaseScheme/PurchaseAccount.cs   | 2 +-
 .../OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs   | 5 +++++
 7 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/BBWY.Client/APIServices/PurchaseOrderService.cs b/BBWY.Client/APIServices/PurchaseOrderService.cs
index b6c37501..9347a5b3 100644
--- a/BBWY.Client/APIServices/PurchaseOrderService.cs
+++ b/BBWY.Client/APIServices/PurchaseOrderService.cs
@@ -84,10 +84,12 @@ namespace BBWY.Client.APIServices
         /// <param name="purchaseSchemeProductSkuList"></param>
         /// <param name="purchasePlatform"></param>
         /// <param name="purchaseAccount"></param>
+        /// <param name="purchaseOrderMode"></param>
         /// <param name="tradeMode"></param>
         /// <param name="remark"></param>
         /// <param name="orderId"></param>
         /// <param name="shopId"></param>
+        /// <param name="purchaseAccountId"></param>
         /// <param name="buyerAccount"></param>
         /// <param name="sellerAccount"></param>
         /// <returns></returns>
@@ -100,6 +102,7 @@ namespace BBWY.Client.APIServices
                                            string remark,
                                            string orderId,
                                            long shopId,
+                                           long purchaseAccountId,
                                            string buyerAccount,
                                            string sellerAccount)
         {
@@ -123,6 +126,7 @@ namespace BBWY.Client.APIServices
                 remark,
                 orderId,
                 shopId,
+                purchaseAccountId,
                 buyerAccount,
                 sellerAccount
             }, null, HttpMethod.Post);
diff --git a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs
index af3df55c..63e580a9 100644
--- a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs
+++ b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs
@@ -292,6 +292,7 @@ namespace BBWY.Client.ViewModels
                PrucahseRemark,
                orderId,
                globalContext.User.Shop.ShopId,
+               PurchaseAccount.Id,
                PurchaseAccount.AccountName,
                PurchaseScheme.PurchaserName)).ContinueWith(t =>
                {
diff --git a/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml b/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml
index 2341956b..a236d24c 100644
--- a/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml
+++ b/BBWY.Client/Views/Order/RelationPurchaseOrder.xaml
@@ -23,8 +23,8 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="30"/>
-            <RowDefinition Height="0.3*"/>
-            <RowDefinition Height="0.7*"/>
+            <RowDefinition Height="130"/>
+            <RowDefinition Height="1*"/>
             <RowDefinition Height="40"/>
         </Grid.RowDefinitions>
         <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
@@ -99,7 +99,6 @@
             </Grid>
             <ListBox x:Name="listbox_ordersku" Grid.Row="1"
                      ItemsSource="{Binding RelationPurchaseOrderSkuList}"
-                     Style="{StaticResource NoScrollViewListBoxStyle}"
                      ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
                      BorderBrush="{StaticResource Border.Brush}"
                      BorderThickness="1,0,1,1">
diff --git a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 5526daae..11645519 100644
--- a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -10,6 +10,7 @@ using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -195,6 +196,7 @@ namespace BBWY.Server.Business
             var orderDropShipping = new OrderDropShipping()
             {
                 OrderId = createOnlinePurchaseOrderRequest.OrderId,
+                PurchaseAccountId = createOnlinePurchaseOrderRequest.PurchaseAccountId,
                 BuyerAccount = createOnlinePurchaseOrderRequest.BuyerAccount,
                 SellerAccount = createOnlinePurchaseOrderRequest.SellerAccount,
                 CreateTime = DateTime.Now,
@@ -251,8 +253,11 @@ namespace BBWY.Server.Business
 
                 #region 查询采购账号
                 currentProgress = "查询采购账号";
-                var purchaseAccount = fsql.Select<PurchaseAccount>().Where(pa => pa.AccountName == orderDropshipping.BuyerAccount &&
-                                                                           pa.PurchasePlatformId == callbackPlatform).ToOne();
+                var purchaseAccountExp = orderDropshipping.PurchaseAccountId != 0 ? 
+                                         new Func<PurchaseAccount, bool>(pa => pa.Id == orderDropshipping.PurchaseAccountId) :
+                                         new Func<PurchaseAccount, bool>(pa => pa.AccountName == orderDropshipping.BuyerAccount);
+                var purchaseAccount = fsql.Select<PurchaseAccount>().Where(pa => purchaseAccountExp(pa))
+                                                                    .Where(pa => pa.PurchasePlatformId == callbackPlatform).ToOne();
                 if (purchaseAccount == null)
                     throw new Exception($"未查询到采购账号{orderDropshipping.BuyerAccount}");
                 #endregion
diff --git a/BBWY.Server.Model/Db/Order/OrderDropShipping.cs b/BBWY.Server.Model/Db/Order/OrderDropShipping.cs
index 557ec12f..b9d10993 100644
--- a/BBWY.Server.Model/Db/Order/OrderDropShipping.cs
+++ b/BBWY.Server.Model/Db/Order/OrderDropShipping.cs
@@ -20,6 +20,11 @@ namespace BBWY.Server.Model.Db
         [Column(StringLength = 200)]
         public string BuyerAccount { get; set; }
 
+        /// <summary>
+        /// 采购账号Id
+        /// </summary>
+        public long PurchaseAccountId { get; set; } = 0;
+
         [Column(DbType = "datetime")]
         public DateTime? CreateTime { get; set; }
 
diff --git a/BBWY.Server.Model/Db/PurchaseScheme/PurchaseAccount.cs b/BBWY.Server.Model/Db/PurchaseScheme/PurchaseAccount.cs
index 720ef179..94b6b6b1 100644
--- a/BBWY.Server.Model/Db/PurchaseScheme/PurchaseAccount.cs
+++ b/BBWY.Server.Model/Db/PurchaseScheme/PurchaseAccount.cs
@@ -15,7 +15,7 @@ namespace BBWY.Server.Model.Db
         /// 主键
         /// </summary>
         [Column(StringLength = 50, IsPrimary = true, IsNullable = false)]
-        public string Id { get; set; }
+        public long Id { get; set; }
 
 
         public string AccountName { get; set; }
diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs
index a73ba736..295ef332 100644
--- a/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/PurchaseOrder/OnlinePurchase/CreateOnlinePurchaseOrderRequest.cs
@@ -22,6 +22,11 @@
         /// </summary>
         public long ShopId { get; set; }
 
+        /// <summary>
+        /// 在线采购账号Id
+        /// </summary>
+        public long PurchaseAccountId { get; set; }
+
         /// <summary>
         /// 买家账号
         /// </summary>