Commit 45ab1ce5 authored by 332784038@qq.com's avatar 332784038@qq.com

重货优惠、泡货优惠、泡重优惠不在校验订单出货状态

parent d4fd0a03
...@@ -5227,7 +5227,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5227,7 +5227,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
Map<Integer, CurrencyRespDTO> currencyRespDTOMap = currencyApi.getAllCurrency(); Map<Integer, CurrencyRespDTO> currencyRespDTOMap = currencyApi.getAllCurrency();
Map<Integer, UnitRespDto> unitRespDtoMap = unitApi.getAllUnit(); Map<Integer, UnitRespDto> unitRespDtoMap = unitApi.getAllUnit();
ApplyInfoVO applyInfoVO = new ApplyInfoVO(); ApplyInfoVO applyInfoVO = new ApplyInfoVO();
BoxCheckOrderSchedulingEvent event = new BoxCheckOrderSchedulingEvent(orderDO.getOrderId()); // BoxCheckOrderSchedulingEvent event = new BoxCheckOrderSchedulingEvent(orderDO.getOrderId());
switch (specialApplyVO.getApplyType()) { switch (specialApplyVO.getApplyType()) {
case 1: case 1:
applyInfoVO.setName(specialApplyVO.getProdTitleZh() + (specialApplyVO.getCharging() == 1 ? "全包价优惠" : "运费优惠")); applyInfoVO.setName(specialApplyVO.getProdTitleZh() + (specialApplyVO.getCharging() == 1 ? "全包价优惠" : "运费优惠"));
...@@ -5280,7 +5280,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5280,7 +5280,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
applyInfoVO.setOrgValue(specialApplyVO.getOrgWVolume().toString()); applyInfoVO.setOrgValue(specialApplyVO.getOrgWVolume().toString());
applyInfoVO.setNewValue(specialApplyVO.getWVolume().toString()); applyInfoVO.setNewValue(specialApplyVO.getWVolume().toString());
applyInfoVOList.add(applyInfoVO); applyInfoVOList.add(applyInfoVO);
applicationContext.publishEvent(event); // applicationContext.publishEvent(event);
key = WorkFlowEmus.ORDER_HEAVY_GOODS.getKey(); key = WorkFlowEmus.ORDER_HEAVY_GOODS.getKey();
break; break;
case 5: case 5:
...@@ -5288,7 +5288,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5288,7 +5288,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
applyInfoVO.setOrgValue(specialApplyVO.getOrgVWeight().toString()); applyInfoVO.setOrgValue(specialApplyVO.getOrgVWeight().toString());
applyInfoVO.setNewValue(specialApplyVO.getVWeight().toString()); applyInfoVO.setNewValue(specialApplyVO.getVWeight().toString());
applyInfoVOList.add(applyInfoVO); applyInfoVOList.add(applyInfoVO);
applicationContext.publishEvent(event); // applicationContext.publishEvent(event);
key = WorkFlowEmus.ORDER_LIGHT_GOODS.getKey(); key = WorkFlowEmus.ORDER_LIGHT_GOODS.getKey();
break; break;
case 29: case 29:
...@@ -5296,7 +5296,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5296,7 +5296,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
applyInfoVO.setOrgValue(specialApplyVO.getOrgVWeight().toString()); applyInfoVO.setOrgValue(specialApplyVO.getOrgVWeight().toString());
applyInfoVO.setNewValue(specialApplyVO.getVWeight().toString()); applyInfoVO.setNewValue(specialApplyVO.getVWeight().toString());
applyInfoVOList.add(applyInfoVO); applyInfoVOList.add(applyInfoVO);
applicationContext.publishEvent(event); // applicationContext.publishEvent(event);
key = WorkFlowEmus.SHIPMENT_BULKY_CARGO.getKey(); key = WorkFlowEmus.SHIPMENT_BULKY_CARGO.getKey();
break; break;
default: default:
......
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