From 0fc02134a6256260c0a1dce4ea8becbd73e60560 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Fri, 9 Sep 2022 17:46:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/App.xaml.cs                |  4 ++--
 BBWY.Client/Models/Order/Order.cs      | 13 +++++++++++++
 BBWY.Client/Views/Order/OrderList.xaml | 23 ++++++-----------------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs
index 6e289318..30900361 100644
--- a/BBWY.Client/App.xaml.cs
+++ b/BBWY.Client/App.xaml.cs
@@ -31,8 +31,8 @@ namespace BBWY.Client
             var gl = new GlobalContext();
             string userToken = string.Empty;
 #if DEBUG
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDE1OTMxMjU4NjEzMDEwNDMyIiwidGVhbUlkIjoiMTQxNDkzNTcwNDQ2MjQzMDIwOCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTQxMDY1MjV9.XeMruS0YkwI7B6nODGe-vbdUqA_PSAt4EacfRAHIjV0"; //齐越文魁
-            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDA1MTUxNjE5NTk0NTg4MTYwIiwidGVhbUlkIjoiMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTY4NjQ4MjU0M30.emnQNDcbqnuO2jH0Kgfk2Ui7crrwzRb986Sa511iS-U";  //齐越小一
+            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDE1OTMxMjU4NjEzMDEwNDMyIiwidGVhbUlkIjoiMTQxNDkzNTcwNDQ2MjQzMDIwOCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTQxMDY1MjV9.XeMruS0YkwI7B6nODGe-vbdUqA_PSAt4EacfRAHIjV0"; //齐越文魁
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDA1MTUxNjE5NTk0NTg4MTYwIiwidGVhbUlkIjoiMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTY4NjQ4MjU0M30.emnQNDcbqnuO2jH0Kgfk2Ui7crrwzRb986Sa511iS-U";  //齐越小一
 
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTA1OTcyOTk3ODUzMTg0IiwidGVhbUlkIjoiMTQzOTkwNDA1MDc3NzY5MDExMiIsImV4cCI6MTY4NjQxODcyOH0.K7-MXjt_zfNK5v_08VjmCDnhAGF6SI7sEQr5sgDn7Jk"; //齐越珍珍
 
diff --git a/BBWY.Client/Models/Order/Order.cs b/BBWY.Client/Models/Order/Order.cs
index 9c79c61e..73df0c4d 100644
--- a/BBWY.Client/Models/Order/Order.cs
+++ b/BBWY.Client/Models/Order/Order.cs
@@ -207,6 +207,19 @@ namespace BBWY.Client.Models
         /// </summary>
         public IList<AfterSaleOrderGroup> AfterSaleOrderGroupList { get; set; }
 
+        /// <summary>
+        /// 是否为异常订单
+        /// </summary>
+        public bool IsCostException
+        {
+            get
+            {
+                return StorageType != null &&
+                       ((OrderCost?.BeforeTotalCost ?? 0M) == 0M ||
+                       (OrderCost?.BeforeTotalCost ?? 0M) > OrderSellerPrice + FreightPrice);
+            }
+        }
+
         public void LocalConvert()
         {
             ConvertAfterSaleOrderToGroup();
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 3a2fb533..7343c220 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -101,6 +101,9 @@
                            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="异常单" Width="100"
+                           Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=已取消:#8080FF:#F2F2F2}"
+                           Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=已取消:White:#4A4A4A}"/>
                 <c:BButton Content="售后单" Width="100"
                            Background="{Binding IncludeAfterOrder,Converter={StaticResource objConverter},ConverterParameter=true:#8080FF:#F2F2F2}"
                            Foreground="{Binding IncludeAfterOrder,Converter={StaticResource objConverter},ConverterParameter=true:White:#4A4A4A}"
@@ -454,16 +457,6 @@
                                                             <Run Text="货号:" />
                                                             <Run Text="{Binding ProductItemNum}"/>
                                                     </TextBlock>
-                                                    <!--<TextBlock DataContext="{Binding DataContext,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ListBox}}"
-                                                               TextTrimming="CharacterEllipsis">
-                                                        <TextBlock.ToolTip>
-                                                            <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
-                                                                <TextBlock Text="{Binding BuyerRemark}"/>
-                                                            </ToolTip>
-                                                        </TextBlock.ToolTip>
-                                                           <Run Text="买家备注:" />
-                                                           <Run Text="{Binding BuyerRemark}"/>
-                                                    </TextBlock>-->
                                                     <Border BorderBrush="{StaticResource Text.Pink}" BorderThickness="1" HorizontalAlignment="Left" Padding="5,2"
                                                             Visibility="{Binding IsRefund,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}">
                                                         <TextBlock Text="售后" Foreground="{StaticResource Text.Pink}"/>
@@ -584,6 +577,8 @@
                                 <Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="5" HorizontalAlignment="Right"/>
                                 <Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="6" HorizontalAlignment="Right"/>
 
+                                <Border x:Name="bd_costbg" Background="#FCECEE" Grid.Column="3"
+                                        Visibility="{Binding IsCostException,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}" Margin="0,0,1,0"/>
                                 <StackPanel Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,0,10">
 
                                     <StackPanel Orientation="Horizontal">
@@ -981,7 +976,7 @@
                                                                                             <ColumnDefinition Width="60"/>
                                                                                             <ColumnDefinition Width="80"/>
                                                                                         </Grid.ColumnDefinitions>
-                                                                                        
+
                                                                                         <TextBlock Text="{Binding ServiceId}" Style="{StaticResource middleTextBlock}"/>
                                                                                         <TextBlock Text="{Binding ReissueProductAmount}" Grid.Column="1" Style="{StaticResource middleTextBlock}"
                                                                                                    Visibility="{Binding ReissueProductAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
@@ -1064,7 +1059,6 @@
                                             <Run Text="{Binding OrderCost.TotalCost,Mode=OneWay}"/>
                                     </TextBlock>
                                 </StackPanel>
-
                                 <Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="3" VerticalAlignment="Bottom" Margin="0,0,0,23"
                                         Visibility="{Binding Visibility,ElementName=btn_editCost}"/>
                                 <c:BButton x:Name="btn_editCost" Content="修改" Grid.Column="3" VerticalAlignment="Bottom"
@@ -1202,11 +1196,6 @@
                                     <Setter TargetName="btn_outStore" Property="Visibility" Value="Visible"/>
                                 </MultiDataTrigger.Setters>
                             </MultiDataTrigger>
-                            <!--<DataTrigger Binding="{Binding DataContext.IncludeAfterOrder,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
-                                         Value="True">
-                                <Setter TargetName="sp_store" Property="Visibility" Value="Collapsed"/>
-                                <Setter TargetName="listbox_afterSaleOrder" Property="Visibility" Value="Visible"/>
-                            </DataTrigger>-->
                         </DataTemplate.Triggers>
                     </DataTemplate>
                 </ListBox.ItemTemplate>