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 3d0a779..789b6c9 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 @@ -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 ""; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderRefundHistoryVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderRefundHistoryVO.java index cf2b7fe..53537bc 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderRefundHistoryVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderRefundHistoryVO.java @@ -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; } 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 07fe49e..892814e 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 @@ -245,7 +245,14 @@ public class OrderInfoServiceImpl implements IOrderInfoService @Override public List orderRefundHistory(OrderRefundHistoryParam param) { - return orderInfoMapper.orderRefundHistory(param); + List 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 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/pay/constants/PayTypeEnum.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/pay/constants/PayTypeEnum.java index 7381ec8..2dc5b91 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/pay/constants/PayTypeEnum.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/pay/constants/PayTypeEnum.java @@ -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 ""; + } }