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 28c252feb..7c15a4224 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 @@ -283,8 +283,14 @@ public enum BillObjTypeEnum { OFFICIAL_MIUNS_GUILD_CRYSTAL( 187, "官方扣除公会紫晶", BillTypeEnum.OUT, CurrencyEnum.GUILD_CRYSTAL, BillDomainTypeEnum.GUILD_POLICY2), DAILY_TASK_DIAMOND( 188, "日任务奖励", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.DAILY_TASK), DAILY_TASK_GOLD( 189, "日任务奖励钻石", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.DAILY_TASK), - GUILD_TASK_DIAMOND( 190, "公会任务奖励金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.GUILD_TASK), - GUILD_TASK_GOLD( 191, "公会任务奖励钻石", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.DAILY_TASK), + GUILD_TASK_CREATE_DIAMOND( 190, "公会开业金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.GUILD_TASK), + GUILD_TASK_CREATE_GOLD( 191, "公会开业钻石", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.GUILD_TASK), + GUILD_TASK_MIC1_DIAMOND( 192, "公会麦上活跃1金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.GUILD_TASK), + GUILD_TASK_MIC1_GOLD( 193, "公会麦上活跃1钻石", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.GUILD_TASK), + GUILD_TASK_MIC2_DIAMOND( 194, "公会麦上活跃2金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.GUILD_TASK), + GUILD_TASK_MIC2_GOLD( 195, "公会2钻石", BillTypeEnum.IN, CurrencyEnum.GOLD, BillDomainTypeEnum.GUILD_TASK), + DAILY_TASK_NEW_ANCHOR_DIAOMND( 196, "新公会主播金币", BillTypeEnum.IN, CurrencyEnum.DIAMOND, BillDomainTypeEnum.DAILY_TASK), + DAILY_TASK_NEW_ANCHOR_GOLD( 197, "新公会主播钻石", 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-sdk/src/main/java/com/accompany/business/constant/dailytask/DailyTaskTypeEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/dailytask/DailyTaskTypeEnum.java index f115d7b25..8d954dbb7 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/dailytask/DailyTaskTypeEnum.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/dailytask/DailyTaskTypeEnum.java @@ -1,41 +1,57 @@ package com.accompany.business.constant.dailytask; +import com.accompany.core.enumeration.BillObjTypeEnum; + +import static com.accompany.core.enumeration.BillObjTypeEnum.*; + public enum DailyTaskTypeEnum { - DAILY_SIGN("DAILY_SIGN"), ////每日签到 - UP_MIC("UP_MIC"),//"上麦聊天", - UP_MIC_120("UP_MIC"),//上麦聊天(0/120Mins) - PLAY_GAME("PLAY_GAME"),//参与小游戏(0/3) - CHARGE_GOLD_NUM("CHARGE_GOLD_NUM"),//充值7000 - CHARGE_GOLD_NUM_5("CHARGE_GOLD_NUM"),//充值35000 - CHARGE_GOLD_NUM_10("CHARGE_GOLD_NUM"),//充值70000 - CHARGE_GOLD_NUM_50("CHARGE_GOLD_NUM"),//充值350000 - CHARGE_GOLD_NUM_100("CHARGE_GOLD_NUM"),//充值700000 - ROOM_SEND_GIFT("ROOM_SEND_GIFT"),//房间送礼 - RECV_LUCKY_GIFT("RECV_LUCKY_GIFT"),//收到Lucky/Bravo礼物 - RECV_NOMAL_GIFT("RECV_NOMAL_GIFT"),//收到普通礼物 - RECV_NOMAL_GIFT_GOLD("RECV_NOMAL_GIFT_GOLD"),//收到礼物(价值超过2w金币) - UP_MIC_COIN("UP_MIC_COIN"),//周上麦聊天(获得金币) - ROOM_DAY_DIAMOND("ROOM_DAY_DIAMOND"),//房间日流水奖励 - GUILD_WEEK_REWARD("GUILD_WEEK_REWARD"),//公会周奖励 - GUILD_WEEK_REWARD_V2("GUILD_WEEK_REWARD"),//公会周奖励(英语2区版本) - ROOM_SEND_NOMAL_GIFT_GOLD("ROOM_SEND_NOMAL_GIFT_GOLD"),//房间送普通礼物礼单个送礼达到20000金币 - ROOM_SEND_LUCKY_NUM("ROOM_SEND_LUCKY_NUM"),//送出77个lucky礼物 - ROOM_SEND_BRAVO_NUM("ROOM_SEND_BRAVO_NUM"),//送出77个BRAVO礼物 - GM_UP_MIC("GM_UP_MIC"),//每日任务新主播上麦(薅羊毛) - GUILD_SALARY("GUILD_SALARY"),//公会长薪资 - GUILD_CREATE("GUILD_CREATE"),//公会开业仪式 - GUILD_MIC("GUILD_MIC"),//周上麦活跃时长1 - GUILD_MIC_ONE("GUILD_MIC"),//周上麦活跃时长2 + DAILY_SIGN("DAILY_SIGN", null, null), ////每日签到 + UP_MIC("UP_MIC", null, null),//"上麦聊天", + UP_MIC_120("UP_MIC", null, null),//上麦聊天(0/120Mins) + PLAY_GAME("PLAY_GAME", null, null),//参与小游戏(0/3) + CHARGE_GOLD_NUM("CHARGE_GOLD_NUM", null, null),//充值7000 + CHARGE_GOLD_NUM_5("CHARGE_GOLD_NUM", null, null),//充值35000 + CHARGE_GOLD_NUM_10("CHARGE_GOLD_NUM", null, null),//充值70000 + CHARGE_GOLD_NUM_50("CHARGE_GOLD_NUM", null, null),//充值350000 + CHARGE_GOLD_NUM_100("CHARGE_GOLD_NUM", null, null),//充值700000 + ROOM_SEND_GIFT("ROOM_SEND_GIFT", null, null),//房间送礼 + RECV_LUCKY_GIFT("RECV_LUCKY_GIFT", null, null),//收到Lucky/Bravo礼物 + RECV_NOMAL_GIFT("RECV_NOMAL_GIFT", null, null),//收到普通礼物 + RECV_NOMAL_GIFT_GOLD("RECV_NOMAL_GIFT_GOLD", null, null),//收到礼物(价值超过2w金币) + UP_MIC_COIN("UP_MIC_COIN", DAILY_TASK_DIAMOND, DAILY_TASK_GOLD),//周上麦聊天(获得金币) + ROOM_DAY_DIAMOND("ROOM_DAY_DIAMOND", null, null),//房间日流水奖励 + GUILD_WEEK_REWARD("GUILD_WEEK_REWARD", null, null),//公会周奖励 + GUILD_WEEK_REWARD_V2("GUILD_WEEK_REWARD", null, null),//公会周奖励(英语2区版本) + ROOM_SEND_NOMAL_GIFT_GOLD("ROOM_SEND_NOMAL_GIFT_GOLD", null, null),//房间送普通礼物礼单个送礼达到20000金币 + ROOM_SEND_LUCKY_NUM("ROOM_SEND_LUCKY_NUM", null, null),//送出77个lucky礼物 + ROOM_SEND_BRAVO_NUM("ROOM_SEND_BRAVO_NUM", null, null),//送出77个BRAVO礼物 + GM_UP_MIC("GM_UP_MIC", DAILY_TASK_NEW_ANCHOR_DIAOMND, DAILY_TASK_NEW_ANCHOR_GOLD),//每日任务新主播上麦(薅羊毛) + GUILD_SALARY("GUILD_SALARY", null, null),//公会长薪资 + GUILD_CREATE("GUILD_CREATE", BillObjTypeEnum.GUILD_TASK_CREATE_DIAMOND, BillObjTypeEnum.GUILD_TASK_MIC1_GOLD),//公会开业仪式 + GUILD_MIC("GUILD_MIC", BillObjTypeEnum.GUILD_TASK_MIC1_DIAMOND, BillObjTypeEnum.GUILD_TASK_MIC1_GOLD),//周上麦活跃时长1 + GUILD_MIC_ONE("GUILD_MIC", BillObjTypeEnum.GUILD_TASK_MIC2_DIAMOND, BillObjTypeEnum.GUILD_TASK_MIC2_GOLD),//周上麦活跃时长2 ; private String handlerType; + private BillObjTypeEnum diamondBillType;//金币账单 + private BillObjTypeEnum goldBillType; //钻石账单 - DailyTaskTypeEnum(String handlerType) { + DailyTaskTypeEnum(String handlerType, BillObjTypeEnum diamondBillType, BillObjTypeEnum goldBillType) { this.handlerType = handlerType; + this.diamondBillType = diamondBillType; + this.goldBillType = goldBillType; } public String getHandlerType() { return handlerType; } + + public BillObjTypeEnum getDiamondBillType() { + return diamondBillType; + } + + public BillObjTypeEnum getGoldBillType() { + return goldBillType; + } } 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 0cb7286d2..2802ca8b6 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 @@ -156,9 +156,9 @@ public abstract class AbstractDailyTaskHandler implements DailyTaskHandler { } BillObjTypeEnum goldBillObjTypeEnum = null; if(RewardTypeEnum.GOLD.getType().equals(configReward.getAwardType())) { - goldBillObjTypeEnum = DAILY_TASK_GOLD; + goldBillObjTypeEnum = dailyTaskTypeEnum.getGoldBillType() == null ? DAILY_TASK_GOLD : dailyTaskTypeEnum.getGoldBillType(); } else if(RewardTypeEnum.DIAMOND.getType().equals(configReward.getAwardType())) { - goldBillObjTypeEnum = DAILY_TASK_DIAMOND; + goldBillObjTypeEnum = dailyTaskTypeEnum.getDiamondBillType() == null ? DAILY_TASK_DIAMOND : dailyTaskTypeEnum.getDiamondBillType(); } rewardUtil.sendRewardByType(uid, RewardTypeEnum.getByRewardType(configReward.getAwardType()), configReward.getAwardId().intValue(), configReward.getAwardNum().intValue(), dailyTaskVo.getTaskType().name(), Boolean.FALSE, goldBillObjTypeEnum); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildtask/GuildTaskService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildtask/GuildTaskService.java index 32c0c3476..a60a8b562 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildtask/GuildTaskService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildtask/GuildTaskService.java @@ -43,9 +43,6 @@ import java.util.*; import java.util.concurrent.ThreadPoolExecutor; import java.util.stream.Collectors; -import static com.accompany.core.enumeration.BillObjTypeEnum.GUILD_TASK_DIAMOND; -import static com.accompany.core.enumeration.BillObjTypeEnum.GUILD_TASK_GOLD; - @Service public class GuildTaskService { @Autowired @@ -482,9 +479,9 @@ public class GuildTaskService { } BillObjTypeEnum goldBillObjTypeEnum = null; if (RewardTypeEnum.GOLD.getType().equals(configReward.getAwardType())) { - goldBillObjTypeEnum = GUILD_TASK_GOLD; + goldBillObjTypeEnum = dailyTaskTypeEnum.getGoldBillType(); } else if (RewardTypeEnum.DIAMOND.getType().equals(configReward.getAwardType())) { - goldBillObjTypeEnum = GUILD_TASK_DIAMOND; + goldBillObjTypeEnum = dailyTaskTypeEnum.getDiamondBillType(); } rewardUtil.sendRewardByType(configReward.getUid(), RewardTypeEnum.getByRewardType(configReward.getAwardType()), configReward.getAwardId().intValue(), configReward.getAwardNum().intValue(),