添加取消任务接口

BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs

@@ -330,7 +330,7 @@ namespace BBWY.Client.ViewModels.PackTask
             {
                 return;
             }
-            if (TaskId>0&&string.IsNullOrEmpty(SpuId))//修改界面刷新配置数据
+            if (TaskId > 0 && string.IsNullOrEmpty(SpuId))//修改界面刷新配置数据
             {
                 SearchSku(SkuId);
             }
@@ -452,7 +452,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
                 }
                 var productSku = packTaskService.GetProductSku(skuid);
-                if (productSku == null || !productSku.Success||productSku.Data==null)
+                if (productSku == null || !productSku.Success || productSku.Data == null)
                     return;
                 BrandName = productSku.Data.BrandName;
                 CertificateModel = productSku.Data.Cers;
@@ -504,7 +504,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要;
 
                     IsSetBarCode = !config.NeedBar;
-                    IsSetCertificate =!config.NeedCer;
+                    IsSetCertificate = !config.NeedCer;
 
                     bool isSelected = false;
                     foreach (var item in increates)
@@ -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;
                 }
@@ -712,14 +715,14 @@ namespace BBWY.Client.ViewModels.PackTask
                 SkuCount = SkuCount,
                 UserId = globalContext.User.Id.ToString(),
                 ShopId = globalContext.User.Shop.ShopId.ToString(),
-                 NeedBar =IsNeedBarCode==Need.需要,
+                NeedBar = IsNeedBarCode == Need.需要,
-                 NeedCer =IsNeedCertificateModel==Need.需要
+                NeedCer = IsNeedCertificateModel == Need.需要
 
                 //IsWorry = IsWorry
             };
             if (IsNeedBarCode == Need.需要)
             {
-                if (BarCodeModel == null ||IsSetBarCode|| BarCodeModel.Id <= 0)
+                if (BarCodeModel == null || IsSetBarCode || BarCodeModel.Id <= 0)
                 {
                     new TipsWindow("请设置条形码模板").Show();
                     return;

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

@@ -404,7 +404,7 @@ namespace BBWY.Server.Business
                         try
                         {
                             var qikuResponse = restApiService.SendRequest("http://qiku.qiyue666.com/",
-                                                                          "api/PackPurchaseTask/PublicPurchaseTask",
+                                                                          "/api/PackPurchaseTask/BatchPublicPurchaseTask",
                                                                           qikuPackSkuConfigRequest,
                                                                           null,
                                                                           HttpMethod.Post);
@@ -528,12 +528,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));
+                }
+                
             }