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()));