Merge branch 'master-fix' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -3911,6 +3911,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             if (Objects.equals(OrderStatusEnum.IN_WAREHOUSE.getValue(), status)) {
                 // 每次更新已入仓状态的同时，刷新入仓动态
                 Long timeId = null;
+                Date businessTime = null;
                 currentOrderDO.setLastTimeTotalNum(0);
                 if (Objects.nonNull(hasExit) && hasExit == 1) {
                     // 部分退场入仓
@@ -3926,14 +3927,15 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     if (CollectionUtil.isNotEmpty(orderTimeDOS) && orderTimeDOS.size() > 0) {
                         OrderTimeDO timeDO = orderTimeDOS.get(0);
                         timeId = timeDO.getId();
+                        businessTime = timeDO.getBusinessTime();
                         currentOrderDO.setLastTimeTotalNum(timeDO.getTotalNum());
                     }
                     if (Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue())) {
-                        orderBusinessService.addAirOrderTimeLog(currentOrderDO, OrderAirTimeEnum.AIR_IN_WAREHOUSE, null, null, null, null, null, timeId);
+                        orderBusinessService.addAirOrderTimeLog(currentOrderDO, OrderAirTimeEnum.AIR_IN_WAREHOUSE, null, null, null, businessTime, null, timeId);
                     } else if (Objects.equals(currentOrderDO.getTransportId(), TransportTypeShortEnum.SEA_CONTAINER.getValue())) {
                         if (currentOrderDO.getLastTimeTotalNum() != currentOrderDO.getSumNum()) {
                             // 当有入仓箱数变化时才做动态更新
-                            orderBusinessService.addSeaOrderTimeLog(currentOrderDO, OrderSeaTimeEnum.SEA_IN_WAREHOUSE, null, null, null, null, null, timeId);
+                            orderBusinessService.addSeaOrderTimeLog(currentOrderDO, OrderSeaTimeEnum.SEA_IN_WAREHOUSE, null, null, null, businessTime, null, timeId);
                         }
                     }
                 }