diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/MemberWalletEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/MemberWalletEnum.java index 2babb195f..0a5098c73 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/MemberWalletEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/MemberWalletEnum.java @@ -50,4 +50,16 @@ public enum MemberWalletEnum { this.value = value; this.label = label; } + + /** + * 根据value获取label + */ + public static String getLabelByValue(String value) { + for (MemberWalletEnum item : MemberWalletEnum.values()) { + if (item.getValue().equals(value)) { + return item.getLabel(); + } + } + return "未知类型"; + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletLogVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletLogVO.java index 3e9363683..ef05e7f48 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletLogVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletLogVO.java @@ -1,6 +1,7 @@ package com.jsowell.pile.vo.uniapp.customer; import com.jsowell.common.annotation.Excel; +import com.jsowell.common.enums.MemberWalletEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -30,9 +31,14 @@ public class MemberWalletLogVO { /** * 子类型 10-充值, 11-赠送, 12-订单结算退款,20-后管扣款, 21-订单付款, 22-用户退款 */ - @Excel(name = "操作类型(10-充值, 11-赠送, 12-订单结算退款,20-后管扣款, 21-订单付款, 22-用户退款)") private String subType; + /** + * 子类型名称 + */ + @Excel(name = "操作类型") + private String subTypeName; + /** * 出账/入账金额 */ @@ -76,15 +82,21 @@ public class MemberWalletLogVO { /** * 变动前金额 */ + @Excel(name = "变动前金额") private BigDecimal beforeAmount; /** * 变动后金额 */ + @Excel(name = "变动后金额") private BigDecimal afterAmount; /** * 操作人员 */ private String createBy; + + public String getSubTypeName() { + return MemberWalletEnum.getLabelByValue(this.subType); + } }