提交 7190c7ac authored 作者: liruixin's avatar liruixin

货主违约金2

上级 7d04692b
...@@ -427,12 +427,17 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe ...@@ -427,12 +427,17 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
BreakContractOwnerRuleVO.OrderCancelRule orderCancelRule = autoRule.getOrderCancelRule();//订单取消规则 BreakContractOwnerRuleVO.OrderCancelRule orderCancelRule = autoRule.getOrderCancelRule();//订单取消规则
//运单状态(包括货主取消) //运单状态(包括货主取消)
List<Integer> statusList = Arrays.asList( //运单状态(包括货主取消)
new Integer[]{OrderChildEnum.Status.CREATED.getCode(), OrderChildEnum.Status.PAY.getCode(), List<Integer> statusList = new ArrayList<>();
OrderChildEnum.Status.GO_TO_SEND.getCode(), OrderChildEnum.Status.ARRIVE_SEND.getCode(), statusList.add(OrderChildEnum.Status.CREATED.getCode());
OrderChildEnum.Status.LOAD.getCode(), OrderChildEnum.Status.GO_TO_RECEIVE.getCode(), statusList.add(OrderChildEnum.Status.PAY.getCode());
OrderChildEnum.Status.ARRIVE_RECEIVE.getCode(), OrderChildEnum.Status.UNLOAD.getCode(), statusList.add(OrderChildEnum.Status.GO_TO_SEND.getCode());
OrderChildEnum.Status.UNSETTLE.getCode()}); statusList.add(OrderChildEnum.Status.ARRIVE_SEND.getCode());
statusList.add(OrderChildEnum.Status.LOAD.getCode());
statusList.add(OrderChildEnum.Status.GO_TO_RECEIVE.getCode());
statusList.add(OrderChildEnum.Status.ARRIVE_RECEIVE.getCode());
statusList.add(OrderChildEnum.Status.UNLOAD.getCode());
statusList.add(OrderChildEnum.Status.UNSETTLE.getCode());
//由于已经更新了订单状态为货主取消了 //由于已经更新了订单状态为货主取消了
if(Objects.equals(cancelType,CancelOrderEnum.Type.NOT_ARRIVE.getCode())){ if(Objects.equals(cancelType,CancelOrderEnum.Type.NOT_ARRIVE.getCode())){
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论