diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java index 1220a3f1..54310c8d 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -207,9 +207,9 @@ public class DiscSpinningController { } else { String redisKey = ""; if (source.equals(2)) { - redisKey = RedisKeys.getDateKey("spinning:amount:taskW") + userId; + redisKey = RedisKeys.getDateKey("spinning:draw:taskW") + userId; } else if (source.equals(3)) { - redisKey = RedisKeys.getDateKey("spinning:amount:taskM") + userId; + redisKey = RedisKeys.getDateKey("spinning:draw:taskM") + userId; } Map week = redisUtils.get(redisKey, Map.class); for (Map.Entry entry : week.entrySet()) { diff --git a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java index b4433557..284baf9f 100644 --- a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java +++ b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java @@ -98,7 +98,7 @@ public class DiscSpinningServiceImpl extends ServiceImpl prizes = baseMapper.selectList(new QueryWrapper().eq("disc_type", source).orderByAsc("odds")); + List prizes = baseMapper.selectList(new QueryWrapper().eq("disc_type", source).orderByAsc("number")); if (CollectionUtil.isEmpty(prizes)) { DiscSpinningRecord record = new DiscSpinningRecord(result.getName(), sourceId, userId, result.getUrl(), result.getType(), result.getNumber(), DateUtils.formatYMD(new Date()), DateUtils.format(new Date()), source); 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 488f032d..b00fc440 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 @@ -363,7 +363,7 @@ public class TaskCenterServiceImpl extends ServiceImpl