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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
Tankaikai
2024-12-24 18:04:56 +08:00
parent 40dc17c7dc f642cbe20f
commit c0f24ca3ed
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java
View File

@@ -34,7 +34,7 @@ public class DiscSpinningRecordController {
@GetMapping("/selectDiscSpinningRecord") @GetMapping("/selectDiscSpinningRecord")
@ApiOperation("查询大转盘抽奖记录") @ApiOperation("查询大转盘抽奖记录")
public Result selectDiscSpinningRecord(Integer page, Integer limit,@RequestAttribute("userId") Long userId) { public Result selectDiscSpinningRecord(Integer page, Integer limit,@RequestAttribute("userId") Long userId) {
return Result.success().put("data", discSpinningRecordService.page(new Page<>(page, limit), new QueryWrapper<DiscSpinningRecord>().eq("user_id",userId).orderByAsc("create_time"))); return Result.success().put("data", discSpinningRecordService.page(new Page<>(page, limit), new QueryWrapper<DiscSpinningRecord>().eq("user_id",userId).orderByDesc("create_time")));
} }
} }

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

@@ -138,6 +138,9 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
s.setDisabled(false); s.setDisabled(false);
s.setNumber(null); s.setNumber(null);
} }
}else{
s.setDiscNumber(null);
s.setNumber(null);
} }
} }
} }
@@ -294,7 +297,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
if (signCount >= taskCenter.getNumber()) { if (signCount >= taskCenter.getNumber()) {
if (rewardMap.containsKey(9)) { if (rewardMap.containsKey(9)) {
Integer spinningCount = discSpinningRecordService.countSourceRecord(taskCenter.getId()); Integer spinningCount = discSpinningRecordService.countSourceRecord(taskCenter.getId());
countTaskDisc = countTaskDisc + (spinningCount == null ? 0 : spinningCount); countTaskDisc = rewardMap.get(9) + (spinningCount == null ? 0 : spinningCount);
if (countTaskDisc > 0) { if (countTaskDisc > 0) {
taskWRedisMap.put(taskCenter.getId().intValue(), countTaskDisc); taskWRedisMap.put(taskCenter.getId().intValue(), countTaskDisc);
} }