|
|
@@ -270,16 +270,18 @@ public class WlnOrderServiceImpl implements WlnOrderService {
|
|
|
if (orderInfo.getWlnStatus() == 10) {
|
|
|
addExceptionType(orderInfo, OrderExceptionTypeEnum.ORDER_CLOSURE);
|
|
|
// 万里牛状态异常：订单关闭的订单类型修改为无理由并生成对账单
|
|
|
- if (ObjectUtil.notEqual(orderInfo.getClassify(), OrderClassifyEnum.NO_REASON_ORDER.getKey())) {
|
|
|
- if (ObjectUtil.equals(orderInfo.getStatus(), OrderStatusEnum.IN_PRODUCTION.getKey())) {
|
|
|
- orderInfo.setStatus(OrderStatusEnum.COMPLETION_PRODUCTION.getKey());
|
|
|
+ if (orderInfo.getStatus() != null && orderInfo.getStatus() >= OrderStatusEnum.IN_PRODUCTION.getKey()) {
|
|
|
+ if (ObjectUtil.notEqual(orderInfo.getClassify(), OrderClassifyEnum.NO_REASON_ORDER.getKey())) {
|
|
|
+ if (ObjectUtil.equals(orderInfo.getStatus(), OrderStatusEnum.IN_PRODUCTION.getKey())) {
|
|
|
+ orderInfo.setStatus(OrderStatusEnum.COMPLETION_PRODUCTION.getKey());
|
|
|
+ }
|
|
|
+ orderInfo.setClassify(OrderClassifyEnum.NO_REASON_ORDER.getKey());
|
|
|
+ // 生成对账单
|
|
|
+ StatementOfAccountDto statement = new StatementOfAccountDto();
|
|
|
+ statement.setDepartmentId(orderInfo.getDepartmentId());
|
|
|
+ statement.setOrderIdList(Collections.singletonList(orderInfo.getId()));
|
|
|
+ statementOfAccountService.add(statement);
|
|
|
}
|
|
|
- orderInfo.setClassify(OrderClassifyEnum.NO_REASON_ORDER.getKey());
|
|
|
- // 生成对账单
|
|
|
- StatementOfAccountDto statement = new StatementOfAccountDto();
|
|
|
- statement.setDepartmentId(orderInfo.getDepartmentId());
|
|
|
- statement.setOrderIdList(Collections.singletonList(orderInfo.getId()));
|
|
|
- statementOfAccountService.add(statement);
|
|
|
}
|
|
|
}
|
|
|
if (orderInfo.getWlnStatus() == 11) {
|
