From bbf0b5a1f3556af6bce11fb402d2be398bebcd92 Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Thu, 15 Jun 2023 12:37:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWYB.Server.Business/Order/OrderBusiness.cs | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs index b245336..92c009c 100644 --- a/BBWYB.Server.Business/Order/OrderBusiness.cs +++ b/BBWYB.Server.Business/Order/OrderBusiness.cs @@ -53,19 +53,6 @@ namespace BBWYB.Server.Business .Where(opi => opi.PurchaseOrderId == request.PurchaseOrderId); select = select.Where((o, ocs, oct) => childSelect.Where(opi => opi.OrderId == o.Id).Any()); } - if (request.OrderState != null) - { - if (request.OrderState == Enums.OrderState.待付款 || - request.OrderState == Enums.OrderState.打包中 || - request.OrderState == Enums.OrderState.待完结 || - request.OrderState == Enums.OrderState.已完成 || - request.OrderState == Enums.OrderState.已取消) - { - select = select.Where((o, ocs, oct) => o.OrderState == request.OrderState); - } - else if (request.OrderState == Enums.OrderState.等待采购) - select = select.Where((o, ocs, oct) => o.OrderState == Enums.OrderState.等待采购 || o.OrderState == Enums.OrderState.部分采购); - } select = select.WhereIf(request.OrderState == Enums.OrderState.待付款 || request.OrderState == Enums.OrderState.打包中 || request.OrderState == Enums.OrderState.待完结 || From 8dcc88cb6d5288d1dea0a377ba5f27fc58e70b6c Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Thu, 15 Jun 2023 14:36:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=9A=E7=9F=A5C=E7=AB=AF=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseOrder/PurchaseOrderBusiness.cs | 46 +++++++++++++++---- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 425c1d9..34e9a1d 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -17,6 +17,7 @@ using Yitter.IdGenerator; using BBWYB.Server.Business.Extensions; using Microsoft.Extensions.DependencyInjection; using BBWYB.Server.Model.Db.Mds; +using static BBWYB.Server.Model.Enums; namespace BBWYB.Server.Business { @@ -29,6 +30,7 @@ namespace BBWYB.Server.Business private Lazy kuaiDi100ManagerLazy; private Lazy dingDingBusinessLazy; private Lazy qiKuManagerLazy; + private Lazy restApiServiceLazy; private PP_PlatformClientFactory ppPlatformClientFactory => pplatformClientFactoryLazy.Value; private TaskSchedulerManager taskSchedulerManager => taskSchedulerManagerLazy.Value; @@ -37,6 +39,8 @@ namespace BBWYB.Server.Business private KuaiDi100Manager kuaiDi100Manager => kuaiDi100ManagerLazy.Value; private DingDingBusiness dingDingBusiness => dingDingBusinessLazy.Value; private QiKuManager qiKuManager => qiKuManagerLazy.Value; + private RestApiService restApiService => restApiServiceLazy.Value; + private IList cantPurchaseOrderStateList; public PurchaseOrderBusiness(IFreeSql fsql, @@ -51,7 +55,7 @@ namespace BBWYB.Server.Business kuaiDi100ManagerLazy = new Lazy(() => serviceProvider.GetService()); dingDingBusinessLazy = new Lazy(() => serviceProvider.GetService()); qiKuManagerLazy = new Lazy(() => serviceProvider.GetService()); - + restApiServiceLazy = new Lazy(() => serviceProvider.GetService()); cantPurchaseOrderStateList = new List() { Enums.OrderState.已取消, @@ -410,6 +414,10 @@ namespace BBWYB.Server.Business dbOrder.CalculationOrderState(fsql, orderSkus, orderPurchaseInfoList.Union(insertOrderPurchaseInfos).ToList()); #endregion + #region 通知C端状态 + Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); + #endregion + fsql.Transaction(() => { if (updatePurchaseOrderIdList.Count() > 0) @@ -781,6 +789,10 @@ namespace BBWYB.Server.Business dbOrder.CalculationOrderState(fsql, dbOrderSkuList, dbvalidPurchaseOrderList.Union(insertOrderPurchaseInfoList).ToList()); #endregion + #region 通知C端状态 + Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); + #endregion + fsql.Transaction(() => { if (insertOrderPurchaseInfoList.Count() > 0) @@ -950,7 +962,7 @@ namespace BBWYB.Server.Business dingdingMsg.AppendLine($"目标物流公司:{request.ExpressName} {request.ExpressId}"); dingdingMsg.AppendLine($"快递单号:{request.WaybillNo}"); dingdingMsg.Append($"店铺名:{shop.ShopName}"); - SendDingDingOnKD100SubscribeFail(dingdingMsg.ToString()); + Task.Factory.StartNew(() => SendDingDingOnKD100SubscribeFail(dingdingMsg.ToString()), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); #endregion } #endregion @@ -991,8 +1003,8 @@ namespace BBWYB.Server.Business .Set(o => o.OrderState, dbOrder.OrderState); #endregion - #region 通知C端订单状态 - + #region 通知C端状态 + Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); #endregion fsql.Transaction(() => @@ -1095,8 +1107,8 @@ namespace BBWYB.Server.Business taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); #endregion - #region 通知C端订单状态 - + #region 通知C端状态 + Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); #endregion fsql.Transaction(() => @@ -1294,7 +1306,7 @@ namespace BBWYB.Server.Business dingdingMsg.AppendLine($"目标物流公司:{kuaidi100Company?.TargetName} {kuaidi100Company?.TargetCode}"); dingdingMsg.AppendLine($"快递单号:{logisticsInfo.WayBillNo}"); dingdingMsg.Append($"店铺名:{shop.ShopName}"); - SendDingDingOnKD100SubscribeFail(dingdingMsg.ToString()); + Task.Factory.StartNew(() => SendDingDingOnKD100SubscribeFail(dingdingMsg.ToString()), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); #endregion } #endregion @@ -1343,7 +1355,7 @@ namespace BBWYB.Server.Business #endregion #region 通知C端订单状态 - + Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); #endregion fsql.Transaction(() => @@ -1826,7 +1838,7 @@ namespace BBWYB.Server.Business #endregion #region 通知C端状态 - + Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler); #endregion fsql.Transaction(() => @@ -1852,5 +1864,21 @@ namespace BBWYB.Server.Business } catch { } } + + private void SendPurchaseOrderStateToC(string orderId, Enums.OrderState orderState) + { + try + { + restApiService.SendRequest("https://bbwy.qiyue666.com", "api/BatchPurchase/UpdatePurchaseOrderState", new + { + OrderId = orderId, + PurchaseOrderState = orderState + }, null, HttpMethod.Post); + } + catch + { + + } + } } }