From 1d92fde1772b364f07bd6b46a02bbca0bc61dbe2 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 14 Feb 2023 00:48:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BB=93=E5=82=A8=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=97=B6=E5=90=8C=E6=97=B6=E4=BF=AE=E6=94=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E4=B8=BA=E5=BE=85=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Server.Business/Order/OrderBusiness.cs | 11 ++++++++--- BBWY.Server.Business/Sync/OrderSyncBusiness.cs | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs index fb561459..48fa7d9e 100644 --- a/BBWY.Server.Business/Order/OrderBusiness.cs +++ b/BBWY.Server.Business/Order/OrderBusiness.cs @@ -462,7 +462,9 @@ namespace BBWY.Server.Business List insertOrderCostDetailList = new List(); if (autoCalculationCostRequest.IsSetStorageType) - orderUpdate = fsql.Update(autoCalculationCostRequest.OrderId).Set(o => o.StorageType, autoCalculationCostRequest.StorageType); + orderUpdate = fsql.Update(autoCalculationCostRequest.OrderId) + .Set(o => o.StorageType, autoCalculationCostRequest.StorageType) + .SetIf(dbOrder.OrderState == Enums.OrderState.等待采购, o => o.OrderState, Enums.OrderState.待出库); var orderCostPurchaseAmount = 0M; var orderDeliveryExpressFreight = 0M; //发货总运费,sku购买数量第二个开始半价 @@ -610,7 +612,9 @@ namespace BBWY.Server.Business var dbAfterSaleOrderList = fsql.Select().Where(aso => aso.OrderId == manualCalculationCostRequest.OrderId).ToList(); if (manualCalculationCostRequest.IsSetStorageType) - orderUpdate = fsql.Update(manualCalculationCostRequest.OrderId).Set(o => o.StorageType, manualCalculationCostRequest.StorageType); + orderUpdate = fsql.Update(manualCalculationCostRequest.OrderId) + .Set(o => o.StorageType, manualCalculationCostRequest.StorageType) + .SetIf(dbOrder.OrderState == Enums.OrderState.等待采购, o => o.OrderState, Enums.OrderState.待出库); insertOrderCostDetailList.AddRange(manualCalculationCostRequest.OrderCostDetailList.Map>()); foreach (var orderCostDetail in insertOrderCostDetailList) @@ -727,7 +731,8 @@ namespace BBWY.Server.Business .Set(o => o.SDOperator, sdCalculationCostRequest.SDOperator) .SetIf(sdCalculationCostRequest.SDPayChannel != null, o => o.SDPayChannel, sdCalculationCostRequest.SDPayChannel); if (sdCalculationCostRequest.IsSetStorageType) - orderUpdate = orderUpdate.Set(o => o.StorageType, Enums.StorageType.SD); + orderUpdate = orderUpdate.Set(o => o.StorageType, Enums.StorageType.SD) + .SetIf(dbOrder.OrderState == Enums.OrderState.等待采购, o => o.OrderState, Enums.OrderState.待出库); var orderCost = fsql.Select(sdCalculationCostRequest.OrderId).ToOne(); if (orderCost == null) diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs index 24b03da2..001e6d6c 100644 --- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs +++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs @@ -74,7 +74,7 @@ namespace BBWY.Server.Business var relayAPIHost = GetPlatformRelayAPIHost(shop.PlatformId); var orderListApiResult = restApiService.SendRequest(relayAPIHost, "api/PlatformSDK/GetOrderList", new SearchPlatformOrderRequest() { - StartDate = startTime ?? DateTime.Now.AddHours(-1), + StartDate = startTime ?? DateTime.Now.AddHours(-3), EndDate = endTime ?? DateTime.Now, AppKey = shop.AppKey, AppSecret = shop.AppSecret,