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 11:05:13 +08:00
parent 64ced85c17 ff9dbb2370
commit a6422e9aa9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java
View File

@ -324,6 +324,7 @@ public class OrderBusiness {
refundOrderInfo.setOrderState(OrderStateEnum.CANCEL.getKey()); refundOrderInfo.setOrderState(OrderStateEnum.CANCEL.getKey());
}else { }else {
refundOrderInfo.setOrderRefundState(OrderRefundStateEnum.PART_SUCC.getKey()); refundOrderInfo.setOrderRefundState(OrderRefundStateEnum.PART_SUCC.getKey());
refundOrderInfo.setOrderState(OrderStateEnum.Part_REFUND.getKey());
} }
refundOrderInfo.setUpdateBy(SecurityUtils.getUsername()); refundOrderInfo.setUpdateBy(SecurityUtils.getUsername());
refundOrderInfo.setUpdateTime(DateUtils.getNowDate()); refundOrderInfo.setUpdateTime(DateUtils.getNowDate());

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/constants/OrderStateEnum.java
View File

@ -6,7 +6,8 @@ public enum OrderStateEnum {
PLACE(1, "已下单"), PLACE(1, "已下单"),
FINISH(2, "已完成"), FINISH(2, "已完成"),
CANCEL(3, "已取消"), CANCEL(3, "已取消"),
WAIT_PLACE(4, "待下单"); WAIT_PLACE(4, "待下单"),
Part_REFUND(5, "部分退单");
private final Integer key; private final Integer key;
private final String desc; private final String desc;