diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java index c1778cd5..a311cfa7 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java @@ -34,7 +34,7 @@ public class DiscSpinningRecordController { @GetMapping("/selectDiscSpinningRecord") @ApiOperation("查询大转盘抽奖记录") public Result selectDiscSpinningRecord(Integer page, Integer limit,@RequestAttribute("userId") Long userId) { - return Result.success().put("data", discSpinningRecordService.page(new Page<>(page, limit), new QueryWrapper().eq("user_id",userId).orderByAsc("create_time"))); + return Result.success().put("data", discSpinningRecordService.page(new Page<>(page, limit), new QueryWrapper().eq("user_id",userId).orderByDesc("create_time"))); } } diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java index 510f468b..086d6724 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java @@ -138,6 +138,9 @@ public class TaskCenterServiceImpl extends ServiceImpl= taskCenter.getNumber()) { if (rewardMap.containsKey(9)) { Integer spinningCount = discSpinningRecordService.countSourceRecord(taskCenter.getId()); - countTaskDisc = countTaskDisc + (spinningCount == null ? 0 : spinningCount); + countTaskDisc = rewardMap.get(9) + (spinningCount == null ? 0 : spinningCount); if (countTaskDisc > 0) { taskWRedisMap.put(taskCenter.getId().intValue(), countTaskDisc); }