From a7bb3e53fb2e2bb0b074ff1ea8416cb5a4905905 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 4 Jul 2023 13:45:11 +0800
Subject: [PATCH] 1

---
 BBWYB.Server.Business/Order/OrderBusiness.cs | 30 ++++++++++++++------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index dca8999..c5d4530 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -207,7 +207,8 @@ namespace BBWYB.Server.Business
                 foreach (var purchaseExpressOrder in purchaseExpressOrderList)
                 {
                     purchaseExpressOrder.CalculationBelongOrderSku(orderPurchaseInfoList, orderPurchaseRelationInfoList, orderPurchaseSkuInfoList);
-                    var currentOrderSkuList = orderSkuList.Where(osku => osku.OrderId == purchaseExpressOrder.OrderId &&
+                    var currentOrderSkuList = orderSkuList.Where(osku => !string.IsNullOrEmpty(purchaseExpressOrder.BelongSkuIds) &&
+                                                                         osku.OrderId == purchaseExpressOrder.OrderId &&
                                                                          purchaseExpressOrder.BelongSkuIds.Contains(osku.SkuId)).ToList();
                     foreach (var osku in currentOrderSkuList)
                     {
@@ -383,13 +384,26 @@ namespace BBWYB.Server.Business
 
             fsql.Update<Order>(request.OrderId).Set(o => o.OrderState, Enums.OrderState.已取消).ExecuteAffrows();
 
-            var sql = $"update purchaseorderv2 set OrderState=6 where Id='{request.OrderId}'";
-            //取消C端采购单
-            restApiService.SendRequest("https://bbwy.qiyue666.com",
-                                       "/Api/Sql/ExecuteNonQuery",
-                                       new { sql = sql.AESEncrypt() },
-                                       new Dictionary<string, string>() { { "Authorization", $"{mdsToken}" } },
-                                       HttpMethod.Post);
+            try
+            {
+                restApiService.SendRequest("https://bbwy.qiyue666.com", "api/BatchPurchase/UpdatePurchaseOrderState", new
+                {
+                    OrderId = request.OrderId,
+                    PurchaseOrderState = Enums.OrderState.已取消
+                }, null, HttpMethod.Post);
+            }
+            catch
+            {
+
+            }
+
+            //var sql = $"update purchaseorderv2 set OrderState=6 where Id='{request.OrderId}'";
+            ////取消C端采购单
+            //restApiService.SendRequest("https://bbwy.qiyue666.com",
+            //                           "/Api/Sql/ExecuteNonQuery",
+            //                           new { sql = sql.AESEncrypt() },
+            //                           new Dictionary<string, string>() { { "Authorization", $"Bearer {mdsToken}" } },
+            //                           HttpMethod.Post);
 
             try
             {