moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日常任务-bugfixed

Browse Source
This commit is contained in:
hokli
2025-09-03 18:12:11 +08:00
parent 9057a22bdc
commit a2515ad7a9
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/dailytask/DailyTaskTypeEnum.java
View File

@@ -18,6 +18,7 @@ public enum DailyTaskTypeEnum {
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礼物

2
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildMemberWeekLevelRewardItemVo.java
View File

@@ -42,4 +42,6 @@ public class GuildMemberWeekLevelRewardItemVo {
private BigDecimal bonusRewardNum;
@ApiModelProperty("状态012")
private Byte bonusStatus;
@ApiModelProperty("是否隐藏")
private boolean hideFlag;
}

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildMicHandler.java
View File

@@ -63,7 +63,7 @@ public class GuildMicHandler extends AbstractDailyTaskHandler {
return null;
}
}
List<GuildTaskLevelInfoVo> guildWeekTaskList = guildTaskService.getGuildWeekTaskList(cycleDate, dailyTaskTypeEnum.getHandlerType(), taskDate, partitionId, guild.getId());
List<GuildTaskLevelInfoVo> guildWeekTaskList = guildTaskService.getGuildWeekTaskList(cycleDate, dailyTaskTypeEnum.name(), taskDate, partitionId, guild.getId());
DailyTaskVo dailyTaskVo = new DailyTaskVo();
dailyTaskVo.setGuildTaskVos(guildWeekTaskList);
ZonedDateTime weekEndTime = nowZonedDateTime.with(TemporalAdjusters.previousOrSame(DayOfWeek.SUNDAY)).withMinute(59).withHour(23).withSecond(59);

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildWeekRewardHandler.java
View File

@@ -10,7 +10,6 @@ import com.accompany.business.vo.dailytask.DailyProgressContext;
import com.accompany.business.vo.dailytask.DailyTaskContext;
import com.accompany.business.vo.dailytask.DailyTaskVo;
import com.accompany.business.vo.guild.GuildMemberWeekLevelRewardVo;
import com.accompany.core.enumeration.PartitionEnum;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -39,10 +38,8 @@ public class GuildWeekRewardHandler extends AbstractDailyTaskHandler {
Long uid = context.getUid();
GuildMember guildMember = guildMemberService.getVaildGuildMemberByUid(uid);
if (guildMember == null) {
dailyTaskVo.setGuildWeekRewardItems(Collections.emptyList());
return null;
}
PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId);
List<GuildMemberWeekLevelRewardVo> guildMemberWeekLevelRewardVos =
guildMemberWeekLevelRewardService.listHistory(guildMember.getId(), partitionId, 1);
if (CollectionUtils.isEmpty(guildMemberWeekLevelRewardVos)) {

1
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardV2Service.java
View File

@@ -211,6 +211,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl<GuildMember
}
vo.setPreLevel(curLevelReward.getPreLevel());
vo.setPreLevelName(curLevelReward.getPreLevelName());
vo.setPreMaxNum(curLevelReward.getPreMaxNum());
vo.setCurLevel(curLevelReward.getLevel());
vo.setProcessNum(curLevelReward.getProcessNum());