From 2bcc0d93d6854cabc0ee8ac7e13a5b517d128314 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 17 May 2023 16:03:35 +0800
Subject: [PATCH] =?UTF-8?q?B=E7=AB=AF=20=E8=AE=A2=E5=8D=95Sku=E5=B1=82?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=9D=A5=E6=BA=90Sku?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../APIModel/Response/Order/OrderResponse.cs  |  4 ----
 .../Response/Order/OrderSkuResponse.cs        |  5 ++++
 BBWYB.Client/Views/MainWindow.xaml            |  2 +-
 BBWYB.Client/Views/Order/OrderList.xaml       | 24 ++++++++++++++++++-
 BBWYB.Server.Business/Order/OrderBusiness.cs  | 10 ++++----
 .../Sync/OrderSyncBusiness.cs                 |  9 +++++--
 BBWYB.Server.Model/Db/Order/Order.cs          | 10 ++++----
 BBWYB.Server.Model/Db/Order/OrderSku.cs       |  6 +++++
 8 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs b/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs
index 0547981..e6b59b3 100644
--- a/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs
+++ b/BBWYB.Client/Models/APIModel/Response/Order/OrderResponse.cs
@@ -102,10 +102,6 @@ namespace BBWYB.Client.Models
         ///// </summary>
         //public string ExpressName { get; set; }
 
-        /// <summary>
-        /// 来源Sku
-        /// </summary>
-        public string SourceSku { get; set; }
 
         /// <summary>
         /// 来源店铺名
diff --git a/BBWYB.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs b/BBWYB.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs
index e811252..18a7cde 100644
--- a/BBWYB.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs
+++ b/BBWYB.Client/Models/APIModel/Response/Order/OrderSkuResponse.cs
@@ -38,5 +38,10 @@ namespace BBWYB.Client.Models
         /// Sku标题
         /// </summary>
         public string Title { get; set; }
+
+        /// <summary>
+        /// 来源Sku
+        /// </summary>
+        public string BelongSkuId { get; set; }
     }
 }
diff --git a/BBWYB.Client/Views/MainWindow.xaml b/BBWYB.Client/Views/MainWindow.xaml
index 5c68790..80057ff 100644
--- a/BBWYB.Client/Views/MainWindow.xaml
+++ b/BBWYB.Client/Views/MainWindow.xaml
@@ -24,7 +24,7 @@
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0">
                 <TextBlock Text="{Binding GlobalContext.User.Name}"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10011" Margin="5,0,0,0"/>
+                <TextBlock Text="v10012" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">
diff --git a/BBWYB.Client/Views/Order/OrderList.xaml b/BBWYB.Client/Views/Order/OrderList.xaml
index a3c40b5..2567c09 100644
--- a/BBWYB.Client/Views/Order/OrderList.xaml
+++ b/BBWYB.Client/Views/Order/OrderList.xaml
@@ -428,6 +428,28 @@
                                                             <Run Text="{Binding ItemTotal}"/>
                                                         </TextBlock>
                                                         <StackPanel Orientation="Horizontal">
+                                                            <TextBlock Text="SPU:"/>
+                                                            <c:BButton Content="{Binding ProductId}" Style="{StaticResource LinkButton}"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding ProductId}"
+                                                                   Margin=" 5,0,0,0"/>
+                                                        </StackPanel>
+                                                        <StackPanel Orientation="Horizontal">
+                                                            <StackPanel Orientation="Horizontal">
+                                                                <TextBlock Text="QTSKU:"/>
+                                                                <c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding SkuId}"
+                                                                   Margin=" 5,0,0,0"/>
+
+                                                                <TextBlock Text="JDSKU:" Margin="5,0,0,0"/>
+                                                                <c:BButton Content="{Binding BelongSkuId}" Style="{StaticResource LinkButton}"
+                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                                                   CommandParameter="{Binding BelongSkuId}"
+                                                                   Margin=" 5,0,0,0"/>
+                                                            </StackPanel>
+                                                        </StackPanel>
+                                                        <!--<StackPanel Orientation="Horizontal">
                                                             <StackPanel Orientation="Vertical">
                                                                 <StackPanel Orientation="Horizontal">
                                                                     <TextBlock Text="SPU:"/>
@@ -444,7 +466,7 @@
                                                                    Margin=" 5,0,0,0"/>
                                                                 </StackPanel>
                                                             </StackPanel>
-                                                        </StackPanel>
+                                                        </StackPanel>-->
                                                     </StackPanel>
                                                     <Border Grid.ColumnSpan="2" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"
                                                         DataContext="{Binding DataContext,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index fb2cac8..dc29df7 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -37,10 +37,11 @@ namespace BBWYB.Server.Business
             }
             else
             {
-                if (!string.IsNullOrEmpty(request.Sku) || !string.IsNullOrEmpty(request.ProductId))
+                if (!string.IsNullOrEmpty(request.Sku) || !string.IsNullOrEmpty(request.SourceSku) || !string.IsNullOrEmpty(request.ProductId))
                 {
                     var childSelect = fsql.Select<OrderSku>().As("osku")
                                           .WhereIf(!string.IsNullOrEmpty(request.Sku), osku => osku.SkuId == request.Sku)
+                                          .WhereIf(!string.IsNullOrEmpty(request.SourceSku), osku => osku.BelongSkuId == request.SourceSku)
                                           .WhereIf(!string.IsNullOrEmpty(request.ProductId), osku => osku.ProductId == request.ProductId);
                     select = select.Where((o, ocs, oct) => childSelect.Where(osku => osku.OrderId == o.Id).Any());
                 }
@@ -56,8 +57,7 @@ namespace BBWYB.Server.Business
                                .WhereIf(request.StartDate != null, (o, ocs, oct) => o.StartTime >= request.StartDate)
                                .WhereIf(request.EndDate != null, (o, ocs, oct) => o.StartTime <= request.EndDate)
                                .WhereIf(!string.IsNullOrEmpty(request.ClientOrderId), (o, ocs, oct) => o.ClientOrderId == request.ClientOrderId)
-                               .WhereIf(!string.IsNullOrEmpty(request.SourceShopName), (o, ocs, oct) => o.SourceShopName == request.SourceShopName)
-                               .WhereIf(!string.IsNullOrEmpty(request.SourceSku), (o, ocs, oct) => o.SourceSku.Contains(request.SourceSku));
+                               .WhereIf(!string.IsNullOrEmpty(request.SourceShopName), (o, ocs, oct) => o.SourceShopName == request.SourceShopName);
             }
 
             select = select.WhereIf(request.ShopId != null, (o, ocs, oct) => o.ShopId == request.ShopId);
@@ -92,7 +92,7 @@ namespace BBWYB.Server.Business
                 PreferentialAmount = o.PreferentialAmount,
                 ClientOrderId = o.ClientOrderId,
                 SourceShopName = o.SourceShopName,
-                SourceSku = o.SourceSku,
+                //SourceSku = o.SourceSku,
                 //ExpressName = o.ExpressName,
                 IsPurchased = o.IsPurchased,
                 BuyerAccount = o.BuyerAccount,
@@ -154,7 +154,7 @@ namespace BBWYB.Server.Business
                     order.OrderPurchaseInfoList = orderPurchaseInfoList.Where(op => op.OrderId == order.Id).ToList();
                     foreach (var purchaseOrder in order.OrderPurchaseInfoList)
                     {
-                        purchaseOrder.ExpressState = orderPurchaseSkuInfoList.FirstOrDefault(x => !string.IsNullOrEmpty(x.ExpressState) && 
+                        purchaseOrder.ExpressState = orderPurchaseSkuInfoList.FirstOrDefault(x => !string.IsNullOrEmpty(x.ExpressState) &&
                                                                                                   x.PurchaseOrderId == purchaseOrder.PurchaseOrderId)?.ExpressState;
                     }
                 }
diff --git a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
index 6a69aaa..136bf7b 100644
--- a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
@@ -113,13 +113,17 @@ namespace BBWYB.Server.Business.Sync
                             ClientOrderId = qtOrder.ClientOrderId,
                             BuyerAccount = qtOrder.UserAccount
                         };
+                        JArray belongSkus = null;
                         if (!string.IsNullOrEmpty(qtOrder.Extended))
                         {
                             try
                             {
                                 var jobject = JObject.Parse(qtOrder.Extended);
-                                dbOrder.SourceSku = jobject.Value<string>("SourceSku");
+                                //dbOrder.SourceSku = jobject.Value<string>("SourceSku");
                                 dbOrder.SourceShopName = jobject.Value<string>("SourceShopName");
+
+                                if (jobject.ContainsKey("BelongSkus"))
+                                    belongSkus = jobject["BelongSkus"] as JArray;
                             }
                             catch (Exception ex)
                             {
@@ -145,7 +149,8 @@ namespace BBWYB.Server.Business.Sync
                                 Price = qtOrderSku.SkuPrice,
                                 Title = qtOrderSku.SkuTitle,
                                 ShopId = shopId,
-                                ProductId = qtOrderSku.ProductId
+                                ProductId = qtOrderSku.ProductId,
+                                BelongSkuId = belongSkus?.FirstOrDefault(j=>j.Value<string>("SkuId") == qtOrderSku.SkuId)?.Value<string>("BelongSkuId") ?? string.Empty
                             });
                         }
 
diff --git a/BBWYB.Server.Model/Db/Order/Order.cs b/BBWYB.Server.Model/Db/Order/Order.cs
index c99fd79..9b1170e 100644
--- a/BBWYB.Server.Model/Db/Order/Order.cs
+++ b/BBWYB.Server.Model/Db/Order/Order.cs
@@ -135,11 +135,11 @@ namespace BBWYB.Server.Model.Db
         //[Column(StringLength = 100)]
         //public string ExpressName { get; set; }
 
-        /// <summary>
-        /// 来源Sku
-        /// </summary>
-        [Column(StringLength = 500)]
-        public string SourceSku { get; set; }
+        ///// <summary>
+        ///// 来源Sku
+        ///// </summary>
+        //[Column(StringLength = 500)]
+        //public string SourceSku { get; set; }
 
         /// <summary>
         /// 来源店铺名
diff --git a/BBWYB.Server.Model/Db/Order/OrderSku.cs b/BBWYB.Server.Model/Db/Order/OrderSku.cs
index 81376b7..2bf664c 100644
--- a/BBWYB.Server.Model/Db/Order/OrderSku.cs
+++ b/BBWYB.Server.Model/Db/Order/OrderSku.cs
@@ -57,6 +57,12 @@ namespace BBWYB.Server.Model.Db
 		[Column(StringLength = 50, IsNullable = false)]
 		public string SkuId { get; set; }
 
+		/// <summary>
+		/// 归属SkuId
+		/// </summary>
+		[Column(StringLength = 50)]
+		public string BelongSkuId { get; set; }
+
 		/// <summary>
 		/// Sku标题
 		/// </summary>