From f2d56a7e48550003dff382f41b3be0c514fa77d3 Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Wed, 27 Aug 2025 18:13:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E4=BB=BB=E5=8A=A1-=E6=97=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A5=96=E5=8A=B1=E5=A2=9E=E5=8A=A0=E9=92=BB?= =?UTF-8?q?=E7=9F=B3=E8=B4=A6=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/enumeration/BillObjTypeEnum.java | 3 ++- .../dailytask/AbstractDailyTaskHandler.java | 15 +++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/BillObjTypeEnum.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/BillObjTypeEnum.java index 4d28b8350..a31fb4aad 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/BillObjTypeEnum.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/BillObjTypeEnum.java @@ -281,7 +281,8 @@ public enum BillObjTypeEnum { OFFICIAL_PLUS_GUILD_CRYSTAL( 186, "官方增加公会紫晶", BillTypeEnum.IN, CurrencyEnum.GUILD_CRYSTAL, BillDomainTypeEnum.GUILD_POLICY2), OFFICIAL_MIUNS_GUILD_CRYSTAL( 187, "官方扣除公会紫晶", BillTypeEnum.OUT, CurrencyEnum.GUILD_CRYSTAL, BillDomainTypeEnum.GUILD_POLICY2), - DAILY_TASK_COIN( 188, "日任务奖励", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.DAILY_TASK), + DAILY_TASK_DIAMOND( 188, "日任务奖励", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.DAILY_TASK), + DAILY_TASK_GOLD( 189, "日任务奖励钻石", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.DAILY_TASK), ; BillObjTypeEnum(int value, String desc, BillTypeEnum type, CurrencyEnum currency, BillDomainTypeEnum domain) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/AbstractDailyTaskHandler.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/AbstractDailyTaskHandler.java index 6017b8389..2d6c1a70f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/AbstractDailyTaskHandler.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/AbstractDailyTaskHandler.java @@ -16,6 +16,7 @@ import com.accompany.business.vo.dailytask.DailyTaskVo; import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; +import com.accompany.core.enumeration.BillObjTypeEnum; import com.accompany.core.enumeration.PartitionEnum; import com.accompany.core.exception.ServiceException; import com.accompany.core.model.Users; @@ -32,7 +33,8 @@ import java.util.Date; import static com.accompany.business.constant.dailytask.DailyTaskConstant.RedisKey.task_receive_status; import static com.accompany.business.constant.dailytask.DailyTaskConstant.RedisKey.task_status; -import static com.accompany.core.enumeration.BillObjTypeEnum.DAILY_TASK_COIN; +import static com.accompany.core.enumeration.BillObjTypeEnum.DAILY_TASK_DIAMOND; +import static com.accompany.core.enumeration.BillObjTypeEnum.DAILY_TASK_GOLD; public abstract class AbstractDailyTaskHandler implements DailyTaskHandler { @Autowired @@ -138,10 +140,15 @@ public abstract class AbstractDailyTaskHandler implements DailyTaskHandler { userGoldBeanService.addGoldBean(uid, BigDecimal.valueOf(configReward.getAwardNum()), GoldBeanBillType.TASK_GAIN, String.valueOf(dailyTaskTypeEnum.ordinal()), 1, dailyTaskVo.getTaskType().name(), dailyTaskVo.getReachNum(), dailyTaskVo.getStandardValue(), receiveDate); - } else { - rewardUtil.sendRewardByType(uid, RewardTypeEnum.getByRewardType(configReward.getAwardType()), configReward.getAwardId().intValue(), - configReward.getAwardNum().intValue(), dailyTaskVo.getTaskType().name(), Boolean.FALSE, DAILY_TASK_COIN); } + BillObjTypeEnum goldBillObjTypeEnum = null; + if(RewardTypeEnum.GOLD.getType().equals(configReward.getAwardType())) { + goldBillObjTypeEnum = DAILY_TASK_GOLD; + } else if(RewardTypeEnum.DIAMOND.getType().equals(configReward.getAwardType())) { + goldBillObjTypeEnum = DAILY_TASK_DIAMOND; + } + rewardUtil.sendRewardByType(uid, RewardTypeEnum.getByRewardType(configReward.getAwardType()), configReward.getAwardId().intValue(), + configReward.getAwardNum().intValue(), dailyTaskVo.getTaskType().name(), Boolean.FALSE, goldBillObjTypeEnum); } return BusiResult.success(); }