czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

达标查询统一更换

Browse Source
This commit is contained in:
张松
2024-12-31 10:14:15 +08:00
parent 52a692ebd9
commit 0908d114a2
3 changed files with 73 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
View File

@@ -10,8 +10,10 @@ import com.sqx.common.utils.DateUtils;
import com.sqx.common.utils.RedisKeys;
import com.sqx.common.utils.RedisUtils;
import com.sqx.common.utils.Result;
import com.sqx.modules.app.entity.InviteAchievement;
import com.sqx.modules.app.entity.UserEntity;
import com.sqx.modules.app.entity.UserMoneyDetails;
import com.sqx.modules.app.service.InviteAchievementService;
import com.sqx.modules.app.service.UserMoneyDetailsService;
import com.sqx.modules.app.service.UserMoneyService;
import com.sqx.modules.app.service.UserService;
@@ -55,6 +57,11 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
private UserService userService;
@Autowired
private RedisUtils redisUtils;
private final InviteAchievementService inviteAchievementService;
public TaskCenterServiceImpl(InviteAchievementService inviteAchievementService) {
this.inviteAchievementService = inviteAchievementService;
}
@Override
@@ -62,10 +69,10 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
//任务
List<TaskCenter> taskPage = baseMapper.selectList(new QueryWrapper<TaskCenter>().eq("shows", 1).orderByAsc("sort", "type"));
List<TaskCenter> resultTask = new ArrayList<>();
boolean todaySign = true;
Integer signCount = null;
for (TaskCenter s : taskPage) {
Map<Integer, Integer> rewardMap = taskCenterRewardService.getRewardMap(s.getId());
boolean todaySign = true;
Integer signCount = null;
if (CollectionUtil.isEmpty(rewardMap)) {
continue;
}
@@ -209,7 +216,10 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
signRecordService.save(signRecord);
}
} else if (taskCenter.getType().equals(3) && taskCenter.getId().equals(1L)) {
Integer sumOrderNum = ordersService.countOrderNum(userId, null);
InviteAchievement inviteAchievement = inviteAchievementService.getByUserId(userId);
// Integer sumOrderNum = ordersService.countOrderNum(userId, null);
Integer sumOrderNum = inviteAchievement.getCount();
if (sumOrderNum != null && sumOrderNum < taskCenter.getNumber()) {
return Result.error("领取失败，未达成领取条件");
} else if (recordService.countTaskNum(userId, taskCenter.getId(), null) > 0) {