设置仓储类型时同时修改订单状态为待出库

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -462,7 +462,9 @@ namespace BBWY.Server.Business
             List<OrderCostDetail> insertOrderCostDetailList = new List<OrderCostDetail>();
 
             if (autoCalculationCostRequest.IsSetStorageType)
-                orderUpdate = fsql.Update<Order>(autoCalculationCostRequest.OrderId).Set(o => o.StorageType, autoCalculationCostRequest.StorageType);
+                orderUpdate = fsql.Update<Order>(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<AfterSaleOrder>().Where(aso => aso.OrderId == manualCalculationCostRequest.OrderId).ToList();
 
             if (manualCalculationCostRequest.IsSetStorageType)
-                orderUpdate = fsql.Update<Order>(manualCalculationCostRequest.OrderId).Set(o => o.StorageType, manualCalculationCostRequest.StorageType);
+                orderUpdate = fsql.Update<Order>(manualCalculationCostRequest.OrderId)
+                                  .Set(o => o.StorageType, manualCalculationCostRequest.StorageType)
+                                  .SetIf(dbOrder.OrderState == Enums.OrderState.等待采购, o => o.OrderState, Enums.OrderState.待出库);
 
             insertOrderCostDetailList.AddRange(manualCalculationCostRequest.OrderCostDetailList.Map<IList<OrderCostDetail>>());
             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<OrderCost>(sdCalculationCostRequest.OrderId).ToOne();
             if (orderCost == null)

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,