diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 7d8cbcc..0fc8bb1 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -670,6 +670,7 @@ namespace BBWYB.Server.Business IUpdate updateOrderCost = null; List updatePurchaseTimeLimitTaskOrderSkuList = new List(); + List notifyQikuPackSchemeParamList = new List(); foreach (var purchaseOrder in request.AssociationPurchaseOrderList) { @@ -840,7 +841,36 @@ namespace BBWYB.Server.Business if (!updatePurchaseTimeLimitTaskOrderSkuList.Any(x => x == ocd.SkuId)) updatePurchaseTimeLimitTaskOrderSkuList.Add(ocd.SkuId); } + #endregion + + #region 封装查询齐库合格证参数 + if (dbOrder.IntoStoreType == Enums.IntoStoreType.发回齐越) + { + if (purchaseOrder.PurchasePlatform == Enums.Platform.阿里巴巴) + { + var waitList = insertOrderPurchaseRelationInfoList.Where(r => !notifyQikuPackSchemeParamList.Any(x => x.SkuId == r.SourceSkuId && + x.SkuPurchaseSchemeId == r.SchemeId?.ToString())) + .Select(r => new QiKuPackTaskSkuPurchaseSchemeIdRequest() + { + SkuId = r.SourceSkuId, + SkuPurchaseSchemeId = r.SchemeId?.ToString() + }).ToList(); + if (waitList != null && waitList.Count() > 0) + notifyQikuPackSchemeParamList.AddRange(waitList); + } + else + { + foreach (var ocd in purchaseOrder.AssocationOrderCostDetailList) + { + var orderSku = dbOrderSkuList.FirstOrDefault(osku => osku.SkuId == ocd.SkuId); + if (orderSku == null) + continue; + if (!notifyQikuPackSchemeParamList.Any(x => x.SkuId == orderSku.BelongSkuId)) + notifyQikuPackSchemeParamList.Add(new QiKuPackTaskSkuPurchaseSchemeIdRequest() { SkuId = orderSku.BelongSkuId, SkuPurchaseSchemeId = null }); + } + } + } #endregion } else @@ -930,6 +960,14 @@ namespace BBWYB.Server.Business Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); #endregion + #region 查询齐库合格证 + if (dbOrder.IntoStoreType == Enums.IntoStoreType.发回齐越 && + notifyQikuPackSchemeParamList.Count() > 0) + { + Task.Factory.StartNew(() => qiKuManager.SearchCerConfigured(request.OrderId, notifyQikuPackSchemeParamList, dbOrderSkuList), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); + } + #endregion + fsql.Transaction(() => { if (insertOrderPurchaseInfoList.Count() > 0) diff --git a/SDKAdapter/ExpressCompanyNameConverter.cs b/SDKAdapter/ExpressCompanyNameConverter.cs index 97fb329..65906b7 100644 --- a/SDKAdapter/ExpressCompanyNameConverter.cs +++ b/SDKAdapter/ExpressCompanyNameConverter.cs @@ -125,7 +125,8 @@ namespace SDKAdapter new LogisticsCompanyRelationship(){SourceName="加运美",TargetName="加运美",TargetCode="jiayunmeiwuliu"}, new LogisticsCompanyRelationship(){SourceName="信丰物流",TargetName="信丰物流",TargetCode="xinfengwuliu"}, new LogisticsCompanyRelationship(){SourceName="京东物流",TargetName="京东物流",TargetCode="jd"}, - new LogisticsCompanyRelationship(){ SourceName="速腾快递",TargetName="速腾快递",TargetCode="suteng"} + new LogisticsCompanyRelationship(){SourceName="速腾快递",TargetName="速腾快递",TargetCode="suteng"}, + new LogisticsCompanyRelationship(){SourceName="运通快运",TargetName="运通快运",TargetCode="ytky168"} }); }