bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-06-17 13:14:38 +08:00
parent 05dc6fa2ce 7d43ab725b
commit e3332cce79
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/constants/AccTradeTypeEnum.java
View File

@ -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, "消费退款");

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java
View File

@ -303,8 +303,9 @@ public class OrderInfoServiceImpl implements IOrderInfoService
List<OrderInfo> 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("仅已下单或部分退单订单才能核销");
}
});
}