fix:限制取反(应是&限制)
This commit is contained in:
parent
c0ebe1f047
commit
18889c4186
@ -307,9 +307,9 @@ public class OrderBiz {
|
||||
|
||||
// 订单处于完成/取消状态/待确认状态,不允许新增任务
|
||||
OrderMain orderMain = orderMainService.obtainOrderMainById(orderTaskDTO.getOrderId());
|
||||
if (!Objects.equals(orderMain.getMainOrderStatus(), MainOrderStatusEnum.NOT_STARTED.getCode()) ||
|
||||
if (!Objects.equals(orderMain.getMainOrderStatus(), MainOrderStatusEnum.NOT_STARTED.getCode()) &&
|
||||
!Objects.equals(orderMain.getMainOrderStatus(), MainOrderStatusEnum.PROCESSING.getCode())) {
|
||||
throw new BadRequestException("当前订单状态处于:"+ MainOrderStatusEnum.getInstance(orderMain.getMainOrderStatus()) + ",不允许新增任务");
|
||||
throw new BadRequestException("当前订单状态处于:"+ MainOrderStatusEnum.getInstance(orderMain.getMainOrderStatus()).getDescription() + ",不允许新增任务");
|
||||
}
|
||||
|
||||
// 新建订单飞行任务限制(当前飞行员不能存在任务处于未进行,进行中)
|
||||
|
Loading…
Reference in New Issue
Block a user