From c3bdc88f161261a9ee071f794f1f6f4d9a12b98d Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Fri, 19 May 2023 13:58:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=96=E6=B6=88=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PackTask/PublishTaskViewModel.cs | 41 ++++++++++--------- .../BatchPurchase/BatchPurchaseBusiness.cs | 19 ++++++++- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs index 4a6a58fa..9d71b00b 100644 --- a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs @@ -185,7 +185,7 @@ namespace BBWY.Client.ViewModels.PackTask { Set(ref isSetBarCode, value); - // IsNeedBarCode = IsSetBarCode ? Need.不需要 : Need.需要; + // IsNeedBarCode = IsSetBarCode ? Need.不需要 : Need.需要; } } @@ -199,7 +199,7 @@ namespace BBWY.Client.ViewModels.PackTask { Set(ref isSetCertificate, value); - //IsNeedCertificateModel = IsSetCertificate ? Need.不需要 : Need.需要; + //IsNeedCertificateModel = IsSetCertificate ? Need.不需要 : Need.需要; } } private string setSpuCerStatus; @@ -330,7 +330,7 @@ namespace BBWY.Client.ViewModels.PackTask { return; } - if (TaskId>0&&string.IsNullOrEmpty(SpuId))//修改界面刷新配置数据 + if (TaskId > 0 && string.IsNullOrEmpty(SpuId))//修改界面刷新配置数据 { SearchSku(SkuId); } @@ -375,7 +375,7 @@ namespace BBWY.Client.ViewModels.PackTask ProductNo = ProductNo, Brand = Brand, SkuId = 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; @@ -461,7 +461,7 @@ namespace BBWY.Client.ViewModels.PackTask CertificateModel = new CertificateModel[] { new CertificateModel{ } }; - + } foreach (var item in CertificateModel) @@ -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) @@ -533,7 +533,7 @@ namespace BBWY.Client.ViewModels.PackTask return; } - //加载配置文件 + //加载配置文件 } public void SearSpuCer() @@ -591,7 +591,7 @@ namespace BBWY.Client.ViewModels.PackTask IsSetBarCode = true; IsSetCertificate = true; BarCodeModel = null; - + CertificateModel = null; SkuTitle = string.Empty; GoodsNumber = 0; @@ -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 increateDatas = new List(); + 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; } @@ -650,7 +653,7 @@ namespace BBWY.Client.ViewModels.PackTask }); }); } - // SearchSku(SkuId); + // SearchSku(SkuId); } private void OpenSkuDetail(object param) @@ -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.需要, - NeedCer =IsNeedCertificateModel==Need.需要 - + NeedBar = IsNeedBarCode == 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; @@ -737,12 +740,12 @@ namespace BBWY.Client.ViewModels.PackTask { createTaskModel.CertificateId = CertificateModel.Where(c => c.Id > 0).FirstOrDefault()?.Id; } - catch + catch { - + } - + createTaskModel.CerId = string.Join(",", CertificateModel.Where(c => c.Id > 0).Select(c => c.Id));// } ApiResponse res = null; diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs index 5b4517d1..18c62c89 100644 --- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs +++ b/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().Where(p => p.Id == request.OrderId).ToOne(); fsql.Update(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)); + } + }