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

日常任务-过期排序

Browse Source
This commit is contained in:
hokli
2025-09-04 17:11:59 +08:00
parent ac4096bf61
commit 7dd8568110
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/dailytask/DailyTaskVo.java
View File

@@ -4,7 +4,7 @@ import com.accompany.business.constant.dailytask.DailyTaskConstant;
import com.accompany.business.constant.dailytask.DailyTaskTypeEnum;
import com.accompany.business.model.dailytask.DailyTaskReward;
import com.accompany.business.vo.guild.GuildCycleDiamondWageLevelVo;
import com.accompany.business.vo.guild.GuildMemberWeekLevelRewardItemVo;
import com.accompany.business.vo.guild.GuildMemberWeekLevelRewardVo;
import com.accompany.business.vo.guild.GuildTaskLevelInfoVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -38,7 +38,7 @@ public class DailyTaskVo {
@ApiModelProperty("房间流水奖励")
private DailyTaskRoomDiamondVo diamondVo;
@ApiModelProperty("公会周奖励")
private List<GuildMemberWeekLevelRewardItemVo> guildWeekRewardItems;
private List<GuildMemberWeekLevelRewardVo> guildWeekRewardItems;
@ApiModelProperty("公会长薪资")
private GuildCycleDiamondWageLevelVo cycleDiamondWageLevelVo;
@ApiModelProperty("任务剩余秒数")

8
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/DailyTaskService.java
View File

@@ -148,12 +148,18 @@ public class DailyTaskService {
return executeDailyTaskList;
}
List<DailyTaskVo> expireList = new ArrayList<>();
dailyTaskContexts.stream().forEach(dailyTaskContext -> {
DailyTaskVo taskVo = executeDailyTask(dailyTaskContext);
if (taskVo != null) {
if (taskVo != null && DailyTaskConstant.ReceiveStatus.EXPIRE.equals(taskVo.getReceiveStatus())) {
expireList.add(taskVo);
}else if (taskVo != null) {
executeDailyTaskList.add(taskVo);
}
});
if (expireList.size() > 0) {
executeDailyTaskList.addAll(expireList);
}
return executeDailyTaskList;
}

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

@@ -14,7 +14,6 @@ import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Collections;
import java.util.List;
@Component
@@ -43,10 +42,9 @@ public class GuildWeekRewardHandler extends AbstractDailyTaskHandler {
List<GuildMemberWeekLevelRewardVo> guildMemberWeekLevelRewardVos =
guildMemberWeekLevelRewardSelectService.listHistory(guildMember, partitionId);
if (CollectionUtils.isEmpty(guildMemberWeekLevelRewardVos)) {
dailyTaskVo.setGuildWeekRewardItems(Collections.emptyList());
return null;
}
dailyTaskVo.setGuildWeekRewardItems(guildMemberWeekLevelRewardVos.get(0).getItemList());
dailyTaskVo.setGuildWeekRewardItems(guildMemberWeekLevelRewardVos);
return dailyTaskVo;
}