Merge remote-tracking branch 'origin/BatchPurchase'

BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs

@@ -631,13 +631,16 @@ namespace BBWY.Client.ViewModels.PackTask
             IsNeedCertificateModel = model.CertificateModel == null ? Need.不需要 : Need.需要;
             CertificatePosition = model.CertificatePosition;
             TaskId = model.TaskId;
-            string[] increateDatas = model.Increment1.Split(',');
+
+            List<string> increateDatas = new List<string>();
+            if (model.Increment1 != null)
+                increateDatas = model.Increment1.Split(',').ToList();
 
             bool isTrue = false;
             foreach (var item in increates)
             {
                 isTrue = false;
-                if (increateDatas.Contains(item))
+                if (increateDatas.Count()>0&& increateDatas.Contains(item))
                 {
                     isTrue = true;
                 }

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

@@ -545,12 +545,27 @@ 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));
+                }
+                
             }