Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

订单作废 主单状态检查缺失修复

Browse Source
This commit is contained in:
gaoqr
2026-06-26 11:00:59 +08:00
parent 283cf51edd
commit 62ec992865
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+5 -5
View File
@@ -885,6 +885,11 @@ public class OrderServiceImpl implements OrderService {
if (orderDO == null) { if (orderDO == null) {
throw new ServiceException(ORDER_NOT_EXISTS); throw new ServiceException(ORDER_NOT_EXISTS);
} }
// 状态校验
if (!Objects.equals(orderDO.getStatus(), OrderStatusEnum.EMPTY.getStatus()) &&
!Objects.equals(orderDO.getStatus(), OrderStatusEnum.NEW_ORDER.getStatus())) {
throw new ServiceException(ORDER_CAN_NOT_CANCEL);
}
// 是否主单 // 是否主单
boolean isMainOrder = Objects.equals(orderDO.getOrderType(), OrderTypeEnum.MAIN_ORDER.getStatus()); boolean isMainOrder = Objects.equals(orderDO.getOrderType(), OrderTypeEnum.MAIN_ORDER.getStatus());
@@ -916,11 +921,6 @@ public class OrderServiceImpl implements OrderService {
} }
} }
// 状态排除
if (!Objects.equals(orderDO.getStatus(), OrderStatusEnum.EMPTY.getStatus()) &&
!Objects.equals(orderDO.getStatus(), OrderStatusEnum.NEW_ORDER.getStatus())) {
throw new ServiceException(ORDER_CAN_NOT_CANCEL);
}
return orderMapper.update(new LambdaUpdateWrapper<OrderDO>() return orderMapper.update(new LambdaUpdateWrapper<OrderDO>()
.eq(OrderDO::getId, orderId) .eq(OrderDO::getId, orderId)
.eq(OrderDO::getDeleted, notDeletedStatus) .eq(OrderDO::getDeleted, notDeletedStatus)