From 3452618bde33892c437130fb175c7dbd658fee4a Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Sun, 9 Jul 2023 14:41:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=92=8C=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=20=E5=A4=84=E7=90=86=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BatchPurchaseOrderListViewModel.cs        | 26 +++++--------------
 .../Controllers/BatchPurchaseController.cs    |  8 +++---
 .../PlatformSDK/QuanTanBusiness.cs            |  6 +++++
 .../BatchPurchase/BatchPurchaseBusiness.cs    | 17 ++----------
 4 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
index 7e381de6..07495002 100644
--- a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
@@ -153,18 +153,10 @@ namespace BBWY.Client.ViewModels
             var res = batchPurchaseService.CancelOrder(parameters[1].ToString(), purchaseAccount, "");
             if (res.Success)
             {
-                if (res.Data.Success)
-                {
+               
                     Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
-                    return;
-                }
-
-                MessageBox.Show(res.Data.Msg);
-                return;
             }
-            if (res.Data != null)
-                MessageBox.Show(res.Data.Msg);
-            else
+            if (res != null)
                 MessageBox.Show(res.Msg);
         }
 
@@ -182,17 +174,11 @@ namespace BBWY.Client.ViewModels
             var res = batchPurchaseService.PayOrder(parameters[1].ToString(), PurchasePlatform, purchaseAccount);
             if (res.Success)
             {
-                if (res.Data.Success)
-                {
-                    Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
-                    return;
-                }
-                MessageBox.Show(res.Data.Msg);
-                return;
+               
+              Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
+                   
             }
-            if (res.Data != null)
-                MessageBox.Show(res.Data.Msg);
-            else
+            if (res!= null)
                 MessageBox.Show(res.Msg);
 
 
diff --git a/BBWY.Server.API/Controllers/BatchPurchaseController.cs b/BBWY.Server.API/Controllers/BatchPurchaseController.cs
index e4eace72..ac8f25cf 100644
--- a/BBWY.Server.API/Controllers/BatchPurchaseController.cs
+++ b/BBWY.Server.API/Controllers/BatchPurchaseController.cs
@@ -97,9 +97,9 @@ namespace BBWY.Server.API.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost]
-        public PayPurchaseOrderResponse PayPurchaseOrder([FromBody] PayPurchaseOrderRequest request)
+        public void PayPurchaseOrder([FromBody] PayPurchaseOrderRequest request)
         {
-            return batchPurchaseBusiness.PayPurchaseOrder(request);
+             batchPurchaseBusiness.PayPurchaseOrder(request);
         }
 
         /// <summary>
@@ -108,9 +108,9 @@ namespace BBWY.Server.API.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost]
-        public CancelPurchaseOrderResponse CancelPurchaseOrder([FromBody] CancelPurchaseOrderRequest request)
+        public void CancelPurchaseOrder([FromBody] CancelPurchaseOrderRequest request)
         {
-            return batchPurchaseBusiness.CancelPurchaseOrder(request);
+             batchPurchaseBusiness.CancelPurchaseOrder(request);
         }
 
         /// <summary>
diff --git a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
index b5dc0fc7..b6d279b6 100644
--- a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
@@ -67,6 +67,8 @@ namespace BBWY.Server.Business
             {
                 return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState = PurchaseOrderState.已取消 };
             }
+            throw new BusinessException(qtResponse.Message);
+
             return new PayPurchaseOrderResponse
             {
                 Success = false,
@@ -87,6 +89,10 @@ namespace BBWY.Server.Business
             {
                 return new CancelPurchaseOrderResponse { Success = true };
             }
+
+            throw new BusinessException(qtResponse.Message);
+
+
             return new CancelPurchaseOrderResponse
             {
                 Success = false,
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index 867e9144..236a16f9 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -965,7 +965,7 @@ namespace BBWY.Server.Business
             return new PurchaseOrderV2ListResponse() { Count = total, ItemList = purchaseOrderList };
         }
 
-        public PayPurchaseOrderResponse PayPurchaseOrder(PayPurchaseOrderRequest request)
+        public void PayPurchaseOrder(PayPurchaseOrderRequest request)
         {
             var platformSDKBusiness = platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform);
             var payOrderResponse = platformSDKBusiness.PayPurchaseOrder(request);
@@ -978,15 +978,9 @@ namespace BBWY.Server.Business
         .Set(a => a.OrderState, payOrderResponse.PurchaseOrderState)
         .ExecuteAffrows();
             }
-
-            return new PayPurchaseOrderResponse()
-            {
-                Success = payOrderResponse.Success,
-                Msg = payOrderResponse.Msg
-            };
         }
 
-        public CancelPurchaseOrderResponse CancelPurchaseOrder(CancelPurchaseOrderRequest request)
+        public void CancelPurchaseOrder(CancelPurchaseOrderRequest request)
         {
             var platformSDKBusiness = platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform);
             var payOrderResponse = platformSDKBusiness.CancelPurchaseOrder(request);
@@ -1013,13 +1007,6 @@ namespace BBWY.Server.Business
                 }
 
             }
-
-
-            return new CancelPurchaseOrderResponse()
-            {
-                Success = payOrderResponse.Success,
-                Msg = payOrderResponse.Msg
-            };
         }
 
         public UpdatePackStateResponse UpdatePurchaseOrderState(UpdatePurchaseOrderStateRequest request)