Skip to content

J
jiedao-api-boot-master
Commit 945403d9 authored by zhengyi's avatar zhengyi
Browse files
Options

海运拆单订单也允许进行订单修改审批

parent da71d7ea
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ 945403d9
...@@ -1798,10 +1798,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1798,10 +1798,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (Objects.isNull(vo)) { if (Objects.isNull(vo)) {
throw exception(ORDER_NOT_EXISTS); throw exception(ORDER_NOT_EXISTS);
} }
if (Objects.nonNull(vo.getParentOrderId()) && vo.getParentOrderId() > 0 && !vo.getSplitSeparateOrder()) { // if (Objects.nonNull(vo.getParentOrderId()) && vo.getParentOrderId() > 0 && !vo.getSplitSeparateOrder()) {
// 如果是拆单订单，且未标记为独立订单，则不允许修改 // // 如果是拆单订单，且未标记为独立订单，则不允许修改
throw exception(SPLIT_ORDER_REVOKE_CAN_UPDATE); // throw exception(SPLIT_ORDER_REVOKE_CAN_UPDATE);
} // }
OrderApprovalDO orderApprovalDO = orderApprovalMapper.newItemInfo(null, vo.getOrderId(), ORDER_UPDATE.getValue()); OrderApprovalDO orderApprovalDO = orderApprovalMapper.newItemInfo(null, vo.getOrderId(), ORDER_UPDATE.getValue());
if (Objects.nonNull(orderApprovalDO) && orderApprovalDO.getStatus() == 1) { if (Objects.nonNull(orderApprovalDO) && orderApprovalDO.getStatus() == 1) {
throw exception(YOUR_APPLY_PENDING); throw exception(YOUR_APPLY_PENDING);
...@@ -1853,10 +1853,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1853,10 +1853,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (Objects.isNull(vo)) { if (Objects.isNull(vo)) {
throw exception(ORDER_NOT_EXISTS); throw exception(ORDER_NOT_EXISTS);
} }
if (Objects.nonNull(vo.getParentOrderId()) && vo.getParentOrderId() > 0 && !vo.getSplitSeparateOrder()) { // if (Objects.nonNull(vo.getParentOrderId()) && vo.getParentOrderId() > 0 && !vo.getSplitSeparateOrder()) {
// 如果是拆单订单，且未标记为独立订单，则不允许修改 // // 如果是拆单订单，且未标记为独立订单，则不允许修改
throw exception(SPLIT_ORDER_REVOKE_CAN_UPDATE); // throw exception(SPLIT_ORDER_REVOKE_CAN_UPDATE);
} // }
OrderApprovalDO orderApprovalDO = orderApprovalMapper.newItemInfo(null, vo.getOrderId(), ORDER_UPDATE.getValue()); OrderApprovalDO orderApprovalDO = orderApprovalMapper.newItemInfo(null, vo.getOrderId(), ORDER_UPDATE.getValue());
if (Objects.nonNull(orderApprovalDO) && orderApprovalDO.getStatus() == 1) { if (Objects.nonNull(orderApprovalDO) && orderApprovalDO.getStatus() == 1) {
throw exception(YOUR_APPLY_PENDING); throw exception(YOUR_APPLY_PENDING);
......
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