From 82aec17589afb19a782d5ca55092b13bed7a0afd Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 30 Apr 2023 00:39:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E4=BB=98=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/ChoosePurchaseSchemeViewModel.cs    |  4 ++-
 BBWYB.Client/Views/MainWindow.xaml            |  2 +-
 BBWYB.Client/Views/Order/OrderList.xaml       | 36 +++++++++----------
 .../Sync/OrderSyncBusiness.cs                 |  4 +--
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/BBWYB.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs b/BBWYB.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
index deb0168..7709894 100644
--- a/BBWYB.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
+++ b/BBWYB.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
@@ -108,7 +108,9 @@ namespace BBWYB.Client.ViewModels
                 if (otherSkuGroup.SkuId == skuGroup.SkuId)
                     continue;
 
-                otherSkuGroup.SelectedScheme = otherSkuGroup.SchemeList.FirstOrDefault(s => s.PurchaserId == purchaserId);
+                var samePurchaseScheme = otherSkuGroup.SchemeList.FirstOrDefault(s => s.PurchaserId == purchaserId);
+                if (samePurchaseScheme != null)
+                    otherSkuGroup.SelectedScheme = samePurchaseScheme;
             }
             isResponse = true;
         }
diff --git a/BBWYB.Client/Views/MainWindow.xaml b/BBWYB.Client/Views/MainWindow.xaml
index 3c7a9fb..0033f3c 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="v10005" Margin="5,0,0,0"/>
+                <TextBlock Text="v10006" 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 f0a06cf..bdd72c2 100644
--- a/BBWYB.Client/Views/Order/OrderList.xaml
+++ b/BBWYB.Client/Views/Order/OrderList.xaml
@@ -137,6 +137,18 @@
                            Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Null}"
                            Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=#null:#8080FF:#F2F2F2}"
                            Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=#null:White:#4A4A4A}"/>
+                 <c:BButton Width="100" 
+                           Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待付款:#8080FF:#F2F2F2}"
+                           Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待付款:White:#4A4A4A}"
+                           Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Static cmodel:OrderState.待付款}">
+                    <c:BButton.Content>
+                        <TextBlock>
+                            <Run Text="待付款"/>
+                            <!--<Run Text="{Binding WaitPurchaseOrderCount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                                 Foreground="{StaticResource Text.Pink}"/>-->
+                        </TextBlock>
+                    </c:BButton.Content>
+                </c:BButton>
                 <c:BButton Width="100" 
                            Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=等待采购:#8080FF:#F2F2F2}"
                            Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=等待采购:White:#4A4A4A}"
@@ -144,8 +156,8 @@
                     <c:BButton.Content>
                         <TextBlock>
                             <Run Text="等待采购"/>
-                            <Run Text="{Binding WaitPurchaseOrderCount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-                                 Foreground="{StaticResource Text.Pink}"/>
+                            <!--<Run Text="{Binding WaitPurchaseOrderCount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                                 Foreground="{StaticResource Text.Pink}"/>-->
                         </TextBlock>
                     </c:BButton.Content>
                 </c:BButton>
@@ -156,8 +168,8 @@
                     <c:BButton.Content>
                         <TextBlock>
                             <Run Text="待出库"/>
-                            <Run Text="{Binding WaitOutStoreCount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-                                 Foreground="{StaticResource Text.Pink}"/>
+                            <!--<Run Text="{Binding WaitOutStoreCount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                                 Foreground="{StaticResource Text.Pink}"/>-->
                         </TextBlock>
                     </c:BButton.Content>
                 </c:BButton>
@@ -172,21 +184,7 @@
                 <c:BButton Content="已取消" Width="100"
                            Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=已取消:#8080FF:#F2F2F2}"
                            Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=已取消:White:#4A4A4A}"
-                           Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Static cmodel:OrderState.已取消}"
-                           Visibility="{Binding IsSDGroup,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
-                <!--<c:BButton Width="100"
-                           Background="{Binding IncludeExceptionOrder,Converter={StaticResource objConverter},ConverterParameter=true:#8080FF:#F2F2F2}"
-                           Foreground="{Binding IncludeExceptionOrder,Converter={StaticResource objConverter},ConverterParameter=true:White:#4A4A4A}"
-                           Command="{Binding SetIncludeExceptionOrderCommand}"
-                           Visibility="{Binding IsSDGroup,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}">
-                    <c:BButton.Content>
-                        <TextBlock>
-                            <Run Text="异常单"/>
-                            <Run Text="{Binding ExceptionOrderCount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-                                 Foreground="{StaticResource Text.Pink}"/>
-                        </TextBlock>
-                    </c:BButton.Content>
-                </c:BButton>-->
+                           Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Static cmodel:OrderState.已取消}"/>
             </StackPanel>
 
             <Border x:Name="bd_statistics" Grid.RowSpan="3" HorizontalAlignment="Right" Padding="15,0" TextBlock.Foreground="{StaticResource Text.Color}">
diff --git a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
index 304fd21..b34a584 100644
--- a/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWYB.Server.Business/Sync/OrderSyncBusiness.cs
@@ -83,7 +83,7 @@ namespace BBWYB.Server.Business.Sync
                 foreach (var qtOrder in qtOrderList.Items)
                 {
                     var dbOrder = dbOrderList.FirstOrDefault(o => o.Id == qtOrder.OrderId);
-                    var orderState = ConvertQuanTanOrderState(qtOrder.OrderState, dbOrder?.IsPurchased ?? false);
+                    var orderState = !qtOrder.IsPay ? Enums.OrderState.待付款 : ConvertQuanTanOrderState(qtOrder.OrderState, dbOrder?.IsPurchased ?? false);
                     if (dbOrder == null)
                     {
                         //新订单
@@ -227,7 +227,7 @@ namespace BBWYB.Server.Business.Sync
         private Enums.OrderState ConvertQuanTanOrderState(string qtOrderState, bool isPurchased)
         {
             /*
-             -1、已退款；
+-1、已取消；
 0、待发货；
 1、待收货；
 2、待评价；