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

消费退款记录修改

This commit is contained in:
gaowdong 2025-05-07 09:39:40 +08:00
parent cff5de17f3
commit 046f6250a5
4 changed files with 31 additions and 3 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

@ -1,5 +1,7 @@
package com.bonus.canteen.core.account.constants;
import com.bonus.canteen.core.pay.constants.PayTypeEnum;
public enum AccTradeTypeEnum {
RECHARGE(10, "充值"),
SUBSIDY(20, "补贴"),
@ -23,4 +25,13 @@ public enum AccTradeTypeEnum {
public String getDesc() {
return this.desc;
}
public static String getDescByKey(Integer targetKey) {
for (AccTradeTypeEnum tradeType : AccTradeTypeEnum.values()) {
if (tradeType.getKey().equals(targetKey)) {
return tradeType.getDesc();
}
}
return "";
}
}

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderRefundHistoryVO.java
View File

@ -14,11 +14,13 @@ public class OrderRefundHistoryVO implements Serializable {
private Long orderId;
private BigDecimal realAmount;
private LocalDateTime payTime;
private String payType;
private Integer payType;
private String payTypeName;
@JsonIgnore
private Long tradeId;
private BigDecimal actualAmount;
private String tradeType;
private Integer tradeType;
private String tradeTypeName;
private LocalDateTime tradeTime;
private String updateBy;
}

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

@ -245,7 +245,14 @@ public class OrderInfoServiceImpl implements IOrderInfoService
@Override
public List<OrderRefundHistoryVO> orderRefundHistory(OrderRefundHistoryParam param) {
return orderInfoMapper.orderRefundHistory(param);
List<OrderRefundHistoryVO> list = orderInfoMapper.orderRefundHistory(param);
if(CollUtil.isNotEmpty(list)) {
list.forEach(orderRefundHistoryVO -> {
orderRefundHistoryVO.setPayTypeName(PayTypeEnum.getDescByKey(orderRefundHistoryVO.getPayType()));
orderRefundHistoryVO.setTradeTypeName(AccTradeTypeEnum.getDescByKey(orderRefundHistoryVO.getTradeType()));
});
}
return list;
}
@Override

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/pay/constants/PayTypeEnum.java
View File

@ -119,5 +119,13 @@ public enum PayTypeEnum {
return this.desc;
}
public static String getDescByKey(Integer targetKey) {
for (PayTypeEnum payType : PayTypeEnum.values()) {
if (payType.getKey().equals(targetKey)) {
return payType.getDesc();
}
}
return "";
}
}