From 63e4cacbf4a72cb80b4f52c53c73ca2534716606 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 23 Sep 2022 14:26:47 +0800
Subject: [PATCH] 10044

---
 BBWY.Client/APIServices/OrderService.cs            | 12 ++++++------
 BBWY.Client/App.xaml.cs                            |  5 +++--
 BBWY.Client/ViewModels/Order/OrderListViewModel.cs |  7 ++++++-
 BBWY.Client/Views/MainWindow.xaml                  |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/BBWY.Client/APIServices/OrderService.cs b/BBWY.Client/APIServices/OrderService.cs
index f8c1c229..adc137c4 100644
--- a/BBWY.Client/APIServices/OrderService.cs
+++ b/BBWY.Client/APIServices/OrderService.cs
@@ -156,7 +156,7 @@ namespace BBWY.Client.APIServices
                                                      string sdOperator,
                                                      string flag,
                                                      string venderRemark,
-                                                     decimal platformCommissionRatio)
+                                                     Shop shop)
         {
             return SendRequest<object>(globalContext.BBYWApiHost, "api/order/SDCalculationCost", new
             {
@@ -167,15 +167,15 @@ namespace BBWY.Client.APIServices
                 sdType,
                 sdCommissionAmount,
                 deliveryExpressFreight,
-                platformCommissionRatio,
+                platformCommissionRatio = shop.PlatformCommissionRatio ?? 0.05M,
                 sdKey,
                 sdPayChannel,
                 sdPaybillNo,
                 sdOperator,
-                Platform = globalContext.User.Shop.Platform,
-                AppKey = globalContext.User.Shop.AppKey,
-                AppSecret = globalContext.User.Shop.AppSecret,
-                AppToken = globalContext.User.Shop.AppToken
+                Platform = shop.Platform,
+                AppKey = shop.AppKey,
+                AppSecret = shop.AppSecret,
+                AppToken = shop.AppToken
             }, null, HttpMethod.Post);
         }
 
diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs
index c2bdb51a..7cc7a485 100644
--- a/BBWY.Client/App.xaml.cs
+++ b/BBWY.Client/App.xaml.cs
@@ -8,6 +8,7 @@ using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.IO;
 using System.IO.MemoryMappedFiles;
+using System.Linq;
 using System.Net.Http;
 using System.Reflection;
 using System.Text;
@@ -31,10 +32,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/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index cc48f36d..bd9e627a 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -594,6 +594,10 @@ namespace BBWY.Client.ViewModels
             var sdPayChannel = sd.PayChannel;
             var sdPaybillNo = sd.SdPayBillNo;
             var sdOperator = sd.SdOperator;
+
+            var shop = IsSDGroup ? SdGroupSelectedShop : globalContext.User.Shop;
+
+
             IsLoading = true;
             Task.Factory.StartNew(() => orderService.SDCalculationCost(orderId,
                                                                        isSetStorageType,
@@ -606,7 +610,7 @@ namespace BBWY.Client.ViewModels
                                                                        sdOperator,
                                                                        flag,
                                                                        venderRemark,
-                                                                       globalContext.User.Shop.PlatformCommissionRatio ?? 0.05M))
+                                                                       shop))
                         .ContinueWith(r =>
                         {
                             var response = r.Result;
@@ -620,6 +624,7 @@ namespace BBWY.Client.ViewModels
                             var order = OrderList.FirstOrDefault(o => o.Id == orderId);
                             if (order != null && order.OrderState == Models.OrderState.待付款)
                             {
+                                IsLoading = false;
                                 App.Current.Dispatcher.Invoke(() =>
                                 {
                                     OrderList.Remove(order);
diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml
index 0124cebe..f0219949 100644
--- a/BBWY.Client/Views/MainWindow.xaml
+++ b/BBWY.Client/Views/MainWindow.xaml
@@ -26,7 +26,7 @@
                 <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10043" Margin="5,0,0,0"/>
+                <TextBlock Text="v10044" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">