兼容取消单

BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

@@ -1047,27 +1047,29 @@ namespace BBWY.Server.Business
             var platformSDKBusiness = platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform);
             var payOrderResponse = platformSDKBusiness.CancelPurchaseOrder(request);
 
-            if (payOrderResponse.Success)//取消成功
+            if (!payOrderResponse.Success)//取消成功
             {
-                //var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
-                fsql.Update<PurchaseOrderV2>(request.OrderId)
-                    .Set(po => po.OrderState, Enums.PurchaseOrderState.已取消)
-                    .ExecuteAffrows();
-                try
-                {
-                    var qikuResponse = restApiService.SendRequest("http://qiku.qiyue666.com/",
-                                                                  $"/api/PackPurchaseTask/CancelOrderPackTask?orderId={request.OrderId}",
-                                                                  null,
-                                                                  null,
-                                                                  HttpMethod.Post);
-                    if (qikuResponse.StatusCode != System.Net.HttpStatusCode.OK)
-                        throw new Exception(qikuResponse.Content);
-                }
-                catch (Exception ex)
-                {
-                    nLogManager.GetLogger($"取消打包任务-{request.OrderId}").Error(ex, JsonConvert.SerializeObject(request));
-                }
+                if (!payOrderResponse.Msg.Contains("订单已删除"))
+                    throw new BusinessException(payOrderResponse.Msg);
+            }
 
+            //var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
+            fsql.Update<PurchaseOrderV2>(request.OrderId)
+                .Set(po => po.OrderState, Enums.PurchaseOrderState.已取消)
+                .ExecuteAffrows();
+            try
+            {
+                var qikuResponse = restApiService.SendRequest("http://qiku.qiyue666.com/",
+                                                              $"/api/PackPurchaseTask/CancelOrderPackTask?orderId={request.OrderId}",
+                                                              null,
+                                                              null,
+                                                              HttpMethod.Post);
+                if (qikuResponse.StatusCode != System.Net.HttpStatusCode.OK)
+                    throw new Exception(qikuResponse.Content);
+            }
+            catch (Exception ex)
+            {
+                nLogManager.GetLogger($"取消打包任务-{request.OrderId}").Error(ex, JsonConvert.SerializeObject(request));
             }
         }