From aa65c45f98d6441acbd07b5d2a6ab66cf0293792 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 23 Sep 2022 13:31:15 +0800
Subject: [PATCH] 1

---
 BBWY.Client/App.xaml.cs                       | 4 ++--
 BBWY.Client/Views/Order/OrderListControl.xaml | 4 ++--
 BBWY.Server.Business/Order/OrderBusiness.cs   | 7 ++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs
index b66a121a..c2bdb51a 100644
--- a/BBWY.Client/App.xaml.cs
+++ b/BBWY.Client/App.xaml.cs
@@ -31,10 +31,10 @@ namespace BBWY.Client
             string userToken = string.Empty;
 #if DEBUG
             //齐越山鸡
-            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
 
             //刷单组测试
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs";
+            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs";
             //齐越愉辰
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTEyNDU1MzExNDYyNDAwIiwidGVhbUlkIjoiMTQzOTg5ODYxNzM1ODg0ODAwMCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUwNDA0ODZ9.0TvEhPzTeKvpQY31E5YhgfvRBJHYdvwWRrEHNnF9kkA";
             //齐越悠仁
diff --git a/BBWY.Client/Views/Order/OrderListControl.xaml b/BBWY.Client/Views/Order/OrderListControl.xaml
index f22a564c..bbf67b36 100644
--- a/BBWY.Client/Views/Order/OrderListControl.xaml
+++ b/BBWY.Client/Views/Order/OrderListControl.xaml
@@ -292,7 +292,7 @@
                             </ListBox>
                             <Border Background="{StaticResource Border.Background}"
                                     Grid.Column="2"
-                                    Visibility="{Binding DataContext.IsSDGroup,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}},ConverterParameter=true:Visible:Collapsed}"/>
+                                    Visibility="{Binding DataContext.IsSDGroup,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}},ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
 
                             <Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="2" HorizontalAlignment="Right"/>
                             <Border Width="1" Background="{StaticResource Border.Brush}" Grid.Column="3" HorizontalAlignment="Right"/>
@@ -807,7 +807,7 @@
                             
                             <Border Background="{StaticResource Border.Background}" Margin="0,0,1,0"
                                     Grid.Column="4"
-                                    Visibility="{Binding DataContext.IsSDGroup,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}},ConverterParameter=true:Visible:Collapsed}"/>
+                                    Visibility="{Binding DataContext.IsSDGroup,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}},ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"/>
 
                             <Grid x:Name="sp_store" Grid.Column="5">
                                 <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index 60569900..32817c89 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -1005,7 +1005,12 @@ namespace BBWY.Server.Business
                     ShopId = request.ShopId.ToString(),
                     OrderStartTime = DateTime.Parse(orderInfoJToken["orderCreated"].ToString()),
                     ItemList = new List<OrderSkuResponse>(),
-                    Platform = request.Platform
+                    Platform = request.Platform,
+                    OrderCost = new OrderCostResponse()
+                    {
+                        OrderId = orderInfoJToken["orderId"].ToString(),
+                        IsManualEdited = false
+                    }
                 };
 
                 var orderSkuIds = string.Join(",", orderInfoJToken["itemList"].Children().Select(j => j.Value<string>("skuId")));