From faf73334c7f18ada46514c3ddcabbeff3d1e3fe7 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 6 May 2025 10:04:00 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=90=8E=E5=8F=B0=E5=85=85=E5=80=BC?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E6=8B=A8=EF=BC=8857=EF=BC=89?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/CuMemberRechargeController.java | 4 ++-- .../enums/controller/EnumsController.java | 2 +- .../core/enums/EApproveRechargeStatus.java | 12 +++--------- .../com/hzs/common/core/enums/EPaymentType.java | 17 +++++++++++++++-- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberRechargeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberRechargeController.java index 6c093380..996a2029 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberRechargeController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/manage/CuMemberRechargeController.java @@ -219,11 +219,11 @@ public class CuMemberRechargeController extends BaseController { //多语言翻译 if (CollUtil.isNotEmpty(cuMemberRechargeVOList)) { //枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EPaymentType.values(), EApproveRechargeStatus.values()); + Map transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveRechargeStatus.values()); for (CuMemberRechargeVO memberRecharge : cuMemberRechargeVOList) { Integer pkAccount = memberRecharge.getPkAccount(); memberRecharge.setPkAccountVal(baseService.getAccountTranslateFromDataBase(pkAccount)); - memberRecharge.setPaymentMethodVal(transactionMap.get(EnumsPrefixConstants.PAYMENT_TYPE + memberRecharge.getPaymentMethod())); + memberRecharge.setPaymentMethodVal(EPaymentType.getEnumLabel(memberRecharge.getPaymentMethod())); memberRecharge.setApproveStateVal(transactionMap.get(EnumsPrefixConstants.APPROVE_RECHARGE_OPERATION + memberRecharge.getApproveState())); } } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java index 6c37aae8..1bb1188a 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java @@ -1176,7 +1176,7 @@ public class EnumsController extends BaseController { public AjaxResult getEPaymentType() { List enumEntityList = new ArrayList<>(); for (EPaymentType value : EPaymentType.values()) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.PAYMENT_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } return AjaxResult.success(enumEntityList); } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApproveRechargeStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApproveRechargeStatus.java index 65a66b4c..86ca6aea 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApproveRechargeStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApproveRechargeStatus.java @@ -6,16 +6,10 @@ import lombok.Getter; /** * 充值页面 审核状态 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/28 16:34 - * @Classname: EApproveRechargeStatus - * @Package_name: com.hzs.common.core.enums */ @Getter @AllArgsConstructor -public enum EApproveRechargeStatus { +public enum EApproveRechargeStatus { /** * 待提交 @@ -51,9 +45,9 @@ public enum EApproveRechargeStatus { */ private final String key; - public static EApproveRechargeStatus getApproveRechargeStatus(int value ){ + public static EApproveRechargeStatus getApproveRechargeStatus(int value) { for (EApproveRechargeStatus approveRechargeStatus : EApproveRechargeStatus.values()) { - if (approveRechargeStatus.getValue() == value){ + if (approveRechargeStatus.getValue() == value) { return approveRechargeStatus; } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPaymentType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPaymentType.java index d4b2621c..b49b26cc 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPaymentType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPaymentType.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 交款方式 - * - * @author: hzs */ @AllArgsConstructor @Getter @@ -53,6 +51,12 @@ public enum EPaymentType { * 调换货 */ EXCHANGE_GOODS(8, "调换货", 0, EnumsPrefixConstants.PAYMENT_TYPE + "8"), + + /** + * 调拨 + */ + ALLOT(9, "调拨", 0, EnumsPrefixConstants.PAYMENT_TYPE + "9"), + ; /** @@ -87,4 +91,13 @@ public enum EPaymentType { return null; } + public static String getEnumLabel(int value) { + for (EPaymentType enums : EPaymentType.values()) { + if (enums.getValue() == value) { + return enums.getLabel(); + } + } + return ""; + } + }