From abb0b2e9f3fa98a9ea18068a29b590c945c067eb Mon Sep 17 00:00:00 2001 From: khalil <842328916@qq.com> Date: Mon, 22 Sep 2025 15:31:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E8=B5=A0=E9=80=81=E9=92=BB?= =?UTF-8?q?=E7=9F=B3=E6=B0=B4=E6=99=B6-=E4=BD=BF=E7=94=A8CurrencyType?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BB=A3=E6=9B=BFWalletCurrencyType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/record/OfficialGoldRecordService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java index fdbc6991b..d02ac0380 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/record/OfficialGoldRecordService.java @@ -32,6 +32,7 @@ import com.accompany.common.utils.EnvComponent; import com.accompany.common.utils.StringUtils; import com.accompany.common.utils.UUIDUtil; import com.accompany.core.enumeration.BillObjTypeEnum; +import com.accompany.core.enumeration.CurrencyEnum; import com.accompany.core.enumeration.PartitionEnum; import com.accompany.core.exception.AdminServiceException; import com.accompany.core.exception.ServiceException; @@ -39,6 +40,7 @@ import com.accompany.core.model.Users; import com.accompany.core.service.base.BaseService; import com.accompany.core.service.message.MessageRobotPushService; import com.accompany.core.service.user.UsersBaseService; +import com.accompany.payment.constant.CurrencyTypeEnum; import com.accompany.payment.event.ChargeSuccessEvent; import com.accompany.payment.event.CommonRecharge4ActEvent; import com.accompany.payment.mapper.ChargeRecordMapper; @@ -633,17 +635,17 @@ public class OfficialGoldRecordService extends BaseService { if (record.getBusType() != null) { vo.setCurrencyTypeDesc(busTypeNameMap.get(record.getBusType())); } - if (Constant.WalletCurrencyType.gold.equals(officalSendTypeEnum.getCurrencyType())) { + if (CurrencyEnum.GOLD.equals(officalSendTypeEnum.getCurrencyType())) { if (record.getDiamondNum() == null) { vo.setOperationNum(BigDecimal.valueOf(record.getGoldNum())); } else { vo.setOperationNum(BigDecimal.valueOf(record.getDiamondNum())); } - } else if (Constant.WalletCurrencyType.diamonds.equals(officalSendTypeEnum.getCurrencyType())) { + } else if (CurrencyEnum.DIAMOND.equals(officalSendTypeEnum.getCurrencyType())) { vo.setOperationNum(BigDecimal.valueOf(record.getGoldNum())); - } else if (Constant.WalletCurrencyType.guildUsd.equals(officalSendTypeEnum.getCurrencyType())) { + } else if (CurrencyEnum.GUILD_USD.equals(officalSendTypeEnum.getCurrencyType())) { vo.setOperationNum(BigDecimal.valueOf(record.getDiamondNum())); - } else if (Constant.WalletCurrencyType.guildCrystal.equals(officalSendTypeEnum.getCurrencyType())) { + } else if (CurrencyEnum.GUILD_CRYSTAL.equals(officalSendTypeEnum.getCurrencyType())) { vo.setOperationNum(BigDecimal.valueOf(record.getDiamondNum())); } else { vo.setOperationNum(BigDecimal.valueOf(record.getGoldNum()));