From 1715e5e79919abab94e331f36eb00b6491dd0bb4 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 13 Jan 2025 18:01:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../discSpinning/controller/DiscSpinningController.java       | 4 ++--
 .../discSpinning/service/impl/DiscSpinningServiceImpl.java    | 2 +-
 .../taskCenter/service/impl/TaskCenterServiceImpl.java        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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<String, Object> week = redisUtils.get(redisKey, Map.class);
                 for (Map.Entry<String, Object> 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<DiscSpinningDao, DiscSp
     @Transactional
     public DiscSpinningRecord draws(int drawCount, double orderAmount, Long sourceId, Long userId, Integer source) {
         DiscSpinning result = new DiscSpinning("谢谢惠顾", 1, BigDecimal.ZERO);
-        List<DiscSpinning> prizes = baseMapper.selectList(new QueryWrapper<DiscSpinning>().eq("disc_type", source).orderByAsc("odds"));
+        List<DiscSpinning> prizes = baseMapper.selectList(new QueryWrapper<DiscSpinning>().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<TaskCenterDao, TaskCenter
                     }
                 }
                 if (CollectionUtil.isNotEmpty(taskWRedisMap)) {
-                    redisUtils.set(RedisKeys.getDateKey("spinning:amount:taskW") + userId, taskWRedisMap, DateUtils.todayAfterSecond());
+                    redisUtils.set(RedisKeys.getDateKey("spinning:draw:taskW") + userId, taskWRedisMap, DateUtils.todayAfterSecond());
                 }
             } else if ("3".equals(type)) {
                 if (signCount == null) {
@@ -379,7 +379,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
                     }
                 }
                 if (CollectionUtil.isNotEmpty(taskWRedisMap)) {
-                    redisUtils.set(RedisKeys.getDateKey("spinning:amount:taskM") + userId, taskWRedisMap, DateUtils.todayAfterSecond());
+                    redisUtils.set(RedisKeys.getDateKey("spinning:draw:taskM") + userId, taskWRedisMap, DateUtils.todayAfterSecond());
                 }
             }
         }