diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java index dbb422f..e13ab43 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java @@ -299,9 +299,15 @@ public class OrderInfoServiceImpl implements IOrderInfoService log.info("退单处理中:{}", refundKey); throw new ServiceException("退单处理中"); } - if(orderInfo.getOrderState().equals(OrderRefundStateEnum.FINISH.getKey())) { + if(orderInfo.getOrderRefundState().equals(OrderRefundStateEnum.FINISH.getKey())) { throw new ServiceException("订单已退"); } + if(orderInfo.getOrderState().equals(OrderStateEnum.CANCEL.getKey())) { + throw new ServiceException("订单已取消"); + } + if(orderInfo.getOrderState().equals(OrderStateEnum.FINISH.getKey())) { + throw new ServiceException("订单已核销"); + } if(PayStateEnum.PAY_SUCC.getKey().equals(orderInfo.getPayState())) { List accTradeList = accTradeService.queryTradeAndWallerInfoByOrderNo (String.valueOf(orderId), AccTradeTypeEnum.CONSUME);