合并

BBWY.Client/BBWYAppSettings.json

@@ -1,6 +1,6 @@
 {
-  "BBWYApiHost": "http://localhost:5000",
-  //"BBWYApiHost": "http://bbwytest.qiyue666.com",
+  //"BBWYApiHost": "http://localhost:5000",
+  "BBWYApiHost": "http://bbwytest.qiyue666.com",
   "MDSApiHost": "http://mdsapi.qiyue666.com",
   "JOSApiHost": "",
   "1688ApiHost": "",

BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs

@@ -17,7 +17,7 @@ namespace BBWY.Client.ViewModels
 {
     public class BatchPurchaseOrderListViewModel : BaseVM, IDenpendency
     {
-        private BatchPurchaseService batchPurchaseService; 
+        private BatchPurchaseService batchPurchaseService;
         private GlobalContext globalContext;
         private DateTime startDate;
         private DateTime endDate;
@@ -42,7 +42,7 @@ namespace BBWY.Client.ViewModels
 
         public ICommand PayPurchaseOrderCommand { get; set; }
 
-        public  ICommand CancelPurchaseOrderCommand { get; set; }
+        public ICommand CancelPurchaseOrderCommand { get; set; }
 
         public DateTime StartDate { get => startDate; set { Set(ref startDate, value); } }
         public DateTime EndDate { get => endDate; set { Set(ref endDate, value); } }
@@ -80,7 +80,7 @@ namespace BBWY.Client.ViewModels
             InitQueryPurchaseOrder();
         }
 
-      
+
 
         private void CancelPurchaseOrder(object obj)
         {
@@ -89,12 +89,12 @@ namespace BBWY.Client.ViewModels
                                             MessageBoxImage.Warning);
             if (result != MessageBoxResult.Yes) return;
             //;
-            var parameters = (object[])obj  ;
+            var parameters = (object[])obj;
 
-            var PurchasePlatform = (Platform)parameters[0]  ;//采购平台
+            var PurchasePlatform = (Platform)parameters[0];//采购平台
 
 
-            var purchaseAccount =  globalContext.User.Shop.PurchaseAccountList.FirstOrDefault(p => p.PurchasePlatformId == PurchasePlatform);
+            var purchaseAccount = globalContext.User.Shop.PurchaseAccountList.FirstOrDefault(p => p.PurchasePlatformId == PurchasePlatform);
 
             var res = batchPurchaseService.CancelOrder(parameters[1].ToString(), PurchasePlatform, purchaseAccount, "");
             if (res.Success)
@@ -102,7 +102,8 @@ namespace BBWY.Client.ViewModels
                 Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
                 return;
             }
-            MessageBox.Show(res.Data.Msg);
+            if (res.Data != null)
+                MessageBox.Show(res.Data.Msg);
         }
 
         private void PayPurchaseOrder(object obj)
@@ -116,13 +117,14 @@ namespace BBWY.Client.ViewModels
             var parameters = (object[])obj;
             var PurchasePlatform = (Platform)parameters[0];//采购平台
             var purchaseAccount = globalContext.User.Shop.PurchaseAccountList.FirstOrDefault(p => p.PurchasePlatformId == PurchasePlatform);
-            var res =  batchPurchaseService.PayOrder(parameters[1].ToString(), PurchasePlatform, purchaseAccount);
+            var res = batchPurchaseService.PayOrder(parameters[1].ToString(), PurchasePlatform, purchaseAccount);
             if (res.Success)
             {
                 Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
                 return;
             }
-            MessageBox.Show(res.Data.Msg);
+            if (res.Data != null)
+                MessageBox.Show(res.Data.Msg);
 
         }
 

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="v10090" Margin="5,0,0,0"/>
+                <TextBlock Text="v10091" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs

@@ -24,7 +24,7 @@ namespace BBWY.Server.Business
             var data = payPurchaseOrderRequest.PurchaseAccount;
             var qtResponse = quanTanOrderClient.PayOrder(new  QuanTanPayOrderRequest { orderId= payPurchaseOrderRequest.OrderId,  
                  userAccount= data.AccountName
-            }, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
+            }, payPurchaseOrderRequest.PurchaseAccount.AppKey, payPurchaseOrderRequest.PurchaseAccount.AppSecret);
             if (qtResponse.Status != 200)
                 return new PayPurchaseOrderResponse
                 {