From 7d43ab725b672e8fc11e1807ab394612f57fcfb2 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Tue, 17 Jun 2025 13:09:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=80=80=E5=8D=95=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=A0=B8=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/account/constants/AccTradeTypeEnum.java | 11 +---------- .../core/order/service/impl/OrderInfoServiceImpl.java | 5 +++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/constants/AccTradeTypeEnum.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/constants/AccTradeTypeEnum.java index c389ecb..d42a124 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/constants/AccTradeTypeEnum.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/constants/AccTradeTypeEnum.java @@ -2,18 +2,9 @@ package com.bonus.canteen.core.account.constants; public enum AccTradeTypeEnum { RECHARGE(10, "充值"), - RECHARGE_GIFT(11, "赠送"), - REVOKE_RECHARGE_GIFT(12, "撤销赠送"), - REVOKE_RECHARGE(40, "撤销充值"), SUBSIDY(20, "补贴"), - REVOKE_SUBSIDY(50, "撤销补贴"), - CLEAR(100, "清空"), - LUCK_MONEY(140, "红包发放"), WITHDRAW(30, "提现"), - TRANSFER_OUT(60, "转出"), - TRANSFER_IN(70, "转入"), - FREEZE(80, "冻结"), - UN_FREEZE(90, "解冻"), + CLEAR(100, "清空"), CONSUME(110, "消费"), CONSUME_REPAIR(120, "消费补扣"), CONSUME_REFUND(130, "消费退款"); 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 9316f4f..33dad16 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 @@ -303,8 +303,9 @@ public class OrderInfoServiceImpl implements IOrderInfoService List orderInfoList = orderInfoMapper.selectOrderInfoList(orderQueryParam); if(CollUtil.isNotEmpty(orderInfoList)) { orderInfoList.forEach(orderInfo -> { - if(!OrderStateEnum.PLACE.getKey().equals(orderInfo.getOrderState())) { - throw new ServiceException("仅已下单订单才能核销"); + if(!(OrderStateEnum.PLACE.getKey().equals(orderInfo.getOrderState()) + || OrderStateEnum.Part_REFUND.getKey().equals(orderInfo.getOrderState()))) { + throw new ServiceException("仅已下单或部分退单订单才能核销"); } }); }