Commit b94caa15 authored by zhengyi's avatar zhengyi

海运与空运的到仓时间更新到订单业务修改

Signed-off-by: default avatarzhengyi <landuo321@aliyun.com>
parent 771f9571
...@@ -1455,6 +1455,9 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order ...@@ -1455,6 +1455,9 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
orderTimeDO.setRemarksZh(String.format(orderAirTimeEnum.getRemarksZh(), objective.getTitleZh())); orderTimeDO.setRemarksZh(String.format(orderAirTimeEnum.getRemarksZh(), objective.getTitleZh()));
orderTimeDO.setRemarksEn(String.format(orderAirTimeEnum.getRemarksEn(), objective.getTitleEn())); orderTimeDO.setRemarksEn(String.format(orderAirTimeEnum.getRemarksEn(), objective.getTitleEn()));
} }
orderMapper.update(null, new LambdaUpdateWrapper<OrderDO>()
.set(OrderDO::getUnloadTime, businessTime)
.eq(OrderDO::getOrderId, orderDO.getOrderId()));
// LogisticsInfoDto logisticsDestInfoDto = warehouseLineMapper.getStartInfoAndDestInfoByLineId(orderDO.getLineId()); // LogisticsInfoDto logisticsDestInfoDto = warehouseLineMapper.getStartInfoAndDestInfoByLineId(orderDO.getLineId());
// if (Objects.nonNull(logisticsDestInfoDto)) { // if (Objects.nonNull(logisticsDestInfoDto)) {
// orderTimeDO.setRemarksZh(String.format(orderAirTimeEnum.getRemarksZh(), logisticsDestInfoDto.getDestTitleZh())); // orderTimeDO.setRemarksZh(String.format(orderAirTimeEnum.getRemarksZh(), logisticsDestInfoDto.getDestTitleZh()));
...@@ -1587,6 +1590,9 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order ...@@ -1587,6 +1590,9 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
orderTimeDO.setRemarksZh(String.format(orderSeaTimeEnum.getRemarksZh(), objective.getTitleZh())); orderTimeDO.setRemarksZh(String.format(orderSeaTimeEnum.getRemarksZh(), objective.getTitleZh()));
orderTimeDO.setRemarksEn(String.format(orderSeaTimeEnum.getRemarksEn(), objective.getTitleEn())); orderTimeDO.setRemarksEn(String.format(orderSeaTimeEnum.getRemarksEn(), objective.getTitleEn()));
} }
orderMapper.update(null, new LambdaUpdateWrapper<OrderDO>()
.set(OrderDO::getUnloadTime, businessTime)
.eq(OrderDO::getOrderId, orderDO.getOrderId()));
// LogisticsInfoDto logisticsDestInfoDto = warehouseLineMapper.getStartInfoAndDestInfoByLineId(orderDO.getLineId()); // LogisticsInfoDto logisticsDestInfoDto = warehouseLineMapper.getStartInfoAndDestInfoByLineId(orderDO.getLineId());
// if (Objects.nonNull(logisticsDestInfoDto)) { // if (Objects.nonNull(logisticsDestInfoDto)) {
// orderTimeDO.setRemarksZh(String.format(orderSeaTimeEnum.getRemarksZh(), logisticsDestInfoDto.getDestTitleZh())); // orderTimeDO.setRemarksZh(String.format(orderSeaTimeEnum.getRemarksZh(), logisticsDestInfoDto.getDestTitleZh()));
......
...@@ -4198,16 +4198,16 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -4198,16 +4198,16 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
currentOrderDO.setDaogangTime(now); currentOrderDO.setDaogangTime(now);
// } // }
break; break;
case UNLOADED_CABINET: // case UNLOADED_CABINET:
// if (Objects.isNull(currentOrderDO.getUnloadTime())) { // if (Objects.isNull(currentOrderDO.getUnloadTime())) {
currentOrderDO.setUnloadTime(now); // currentOrderDO.setUnloadTime(now);
// } // }
break; // break;
case UNLOADED_CABINET_AIR: // case UNLOADED_CABINET_AIR:
// if (Objects.isNull(currentOrderDO.getUnloadTime())) { // if (Objects.isNull(currentOrderDO.getUnloadTime())) {
currentOrderDO.setUnloadTime(now); // currentOrderDO.setUnloadTime(now);
// } // }
break; // break;
case PICKED_UP: case PICKED_UP:
// if (Objects.isNull(currentOrderDO.getTakeTime())) { // if (Objects.isNull(currentOrderDO.getTakeTime())) {
currentOrderDO.setTakeTime(now); currentOrderDO.setTakeTime(now);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment