From 2c8721e2e8503d88d23dc0fd29139538c1e704d8 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 24 Dec 2024 11:44:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96=20=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DiscSpinningController.java            | 11 +++++++----
 src/main/resources/mapper/orders/OrdersDao.xml        |  2 +-
 2 files changed, 8 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 96171613..a1233e60 100644
--- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
+++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
@@ -194,24 +194,27 @@ public class DiscSpinningController {
             }else if(source.equals(3)){
                 redisKey = RedisKeys.getDateKey("spinning:amount:taskM") + userId;
             }
-            Map<Integer, Object> week = redisUtils.get(redisKey, Map.class);
-            for (Map.Entry<Integer, Object> entry : week.entrySet()) {
+            Map<String, Object> week = redisUtils.get(redisKey, Map.class);
+            for (Map.Entry<String, Object> entry : week.entrySet()) {
                 int value = new BigDecimal(entry.getValue().toString()).intValue();
                 if (value > 1) {
                     value = value - 1;
                     week.put(entry.getKey(), value);
+                    sourceId = Long.valueOf(entry.getKey());
                     break;
                 } else {
                     TaskCenterRecord centerRecord = new TaskCenterRecord();
                     centerRecord.setUserId(userId);
-                    centerRecord.setTaskId(entry.getKey().longValue());
+                    centerRecord.setTaskId(Long.valueOf(entry.getKey()));
                     if(source.equals(2)){
-                        centerRecord.setSourceId(entry.getKey().longValue());
+                        sourceId = Long.valueOf(entry.getKey());
+                        centerRecord.setSourceId(Long.getLong(entry.getKey()));
                     }
                     centerRecord.setName(source.equals(2) ? "周任务奖励" : "月任务奖励");
                     centerRecord.setType(9);
                     centerRecord.setNumber(1);
                     centerRecord.setCreateTime(DateUtil.now());
+                    centerRecord.setUpdateTime(DateUtil.now());
                     taskRecordService.save(centerRecord);
                     week.remove(entry.getKey());
                     break;
diff --git a/src/main/resources/mapper/orders/OrdersDao.xml b/src/main/resources/mapper/orders/OrdersDao.xml
index 79ba95f7..eaae0119 100644
--- a/src/main/resources/mapper/orders/OrdersDao.xml
+++ b/src/main/resources/mapper/orders/OrdersDao.xml
@@ -281,7 +281,7 @@
     <select id="selectOrdersCountStatisticsByDay" resultType="Integer">
         SELECT count(*)
         FROM orders
-                 LEFT JOIN disc_spinning_record record ON orders.orders_id = record.source_id
+                 LEFT JOIN disc_spinning_record record ON orders.orders_id = record.source_id and record.source = 'order'
         WHERE orders.user_id = #{userId}
           AND orders.`status` = 1
           AND orders.`pay_way` = 9