Commit c6246785 authored by huyf's avatar huyf

提货箱数、提货率、提货状态回填

parent d89468de
...@@ -658,7 +658,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O ...@@ -658,7 +658,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
OrderDO orderDO1 = new OrderDO(); OrderDO orderDO1 = new OrderDO();
BeanUtils.copyProperties(orderDO, orderDO1); BeanUtils.copyProperties(orderDO, orderDO1);
insertCustomLevelAndCreditLevelLog(orderPickup, orderDO1, false); insertCustomLevelAndCreditLevelLog(orderPickup, orderDO1, false);
dealDeliveryRate(createReqVO.getOrderId(),createReqVO.getPickNum(),orderDO.getSumNum(),PickStateEnum.partPick.getPickState()); dealDeliveryRate(createReqVO.getOrderId(),0,orderDO.getSumNum(),PickStateEnum.partPick.getPickState());
} else if (num < 0) { } else if (num < 0) {
//如果分批提的数量加上已分批提的数量超过了总量 则重新计算成剩余的量 //如果分批提的数量加上已分批提的数量超过了总量 则重新计算成剩余的量
throw exception(PICK_UP_TOO_MORE); throw exception(PICK_UP_TOO_MORE);
...@@ -683,7 +683,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O ...@@ -683,7 +683,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
BeanUtils.copyProperties(orderDO, orderDO1); BeanUtils.copyProperties(orderDO, orderDO1);
insertCustomLevelAndCreditLevelLog(orderPickup, orderDO1, true); insertCustomLevelAndCreditLevelLog(orderPickup, orderDO1, true);
updateCustomerLevelUp(orderDO1); updateCustomerLevelUp(orderDO1);
dealDeliveryRate(createReqVO.getOrderId(),createReqVO.getPickNum(),orderDO.getSumNum(),PickStateEnum.picked.getPickState()); dealDeliveryRate(createReqVO.getOrderId(),0,orderDO.getSumNum(),PickStateEnum.picked.getPickState());
} }
orderBusinessService.addOrderOperateLog(orderDO.getOrderId(), "", "分批提货", ""); orderBusinessService.addOrderOperateLog(orderDO.getOrderId(), "", "分批提货", "");
if (Objects.equals(orderDO.getTransportId(), TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue())) { if (Objects.equals(orderDO.getTransportId(), TransportTypeShortEnum.AIR_FREIGHT_LINE.getValue())) {
......
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