diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRewardAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRewardAdminServiceImpl.java index 8f0c3d979..91d4a46a2 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRewardAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRewardAdminServiceImpl.java @@ -187,7 +187,8 @@ public class LuckyGiftRewardAdminServiceImpl implements LuckyGiftRewardAdminServ config.setRewardIcon(gift.getPicUrl()); config.setRewardPrice(gift.getGoldPrice()); } - } else { + } else if (LuckyGiftRewardTypeEnum.DIAMOND.ordinal() == rewardType) { + config.setRewardName("钻石"); config.setRewardPrice(config.getRewardValue()); } if (id == null) { diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRewardRecordAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRewardRecordAdminServiceImpl.java index 65497e251..89e56b455 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRewardRecordAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRewardRecordAdminServiceImpl.java @@ -2,6 +2,7 @@ package com.accompany.admin.service.lucky.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; +import cn.hutool.core.util.StrUtil; import com.accompany.admin.dto.lucky.LuckyGiftSendRecordAdminDto; import com.accompany.admin.mapper.lucky.LuckyGiftRewardRecordAdminMapper; import com.accompany.admin.service.lucky.LuckyGiftRewardRecordAdminService; @@ -69,7 +70,11 @@ public class LuckyGiftRewardRecordAdminServiceImpl implements LuckyGiftRewardRec rewardNum = 0; } LuckyGiftRewardAdminVo admin = new LuckyGiftRewardAdminVo(); - admin.setRewardName(reward.getRewardName()); + String rewardName = reward.getRewardName(); + if (StrUtil.isEmpty(rewardName)) { + rewardName = "钻石"; + } + admin.setRewardName(rewardName); admin.setRewardValue(rewardValue); admin.setRewardNum(rewardNum); admin.setTotalRewardNum(reward.getRewardTotalValue());