From 6ffa4d5bf8de89ead232a318064adc1afca948a0 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 24 Dec 2024 09:29:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../userSign/dao/UserSignRecordDao.java       |  4 ++-
 .../impl/UserSignRecordServiceImpl.java       |  3 +-
 .../resources/mapper/orders/OrdersDao.xml     |  4 +--
 .../mapper/userSign/TaskCenterDto.xml         | 31 +++++++++++++++----
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/sqx/modules/userSign/dao/UserSignRecordDao.java b/src/main/java/com/sqx/modules/userSign/dao/UserSignRecordDao.java
index 878ec4f8..44ccb713 100644
--- a/src/main/java/com/sqx/modules/userSign/dao/UserSignRecordDao.java
+++ b/src/main/java/com/sqx/modules/userSign/dao/UserSignRecordDao.java
@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sqx.modules.userSign.entity.UserSignRecord;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
 import java.util.Map;
 
 @Mapper
 public interface UserSignRecordDao extends BaseMapper<UserSignRecord> {
     //周 抽奖次数
-    Map<Integer,Integer> getTaskWCount(long userId, int wCount,String time);
+    Map<Integer,Integer> getTaskWCount(long userId, int wCount,String time,List<Integer> ids);
+    List getNoRecordTask(long userId,  String time);
     //周 签到 次数 连续签到
     Integer getWSignCount(long userId,String time);
 
diff --git a/src/main/java/com/sqx/modules/userSign/service/impl/UserSignRecordServiceImpl.java b/src/main/java/com/sqx/modules/userSign/service/impl/UserSignRecordServiceImpl.java
index a95af798..698bf03b 100644
--- a/src/main/java/com/sqx/modules/userSign/service/impl/UserSignRecordServiceImpl.java
+++ b/src/main/java/com/sqx/modules/userSign/service/impl/UserSignRecordServiceImpl.java
@@ -134,7 +134,8 @@ public class UserSignRecordServiceImpl extends ServiceImpl<UserSignRecordDao, Us
     @Override
     public Map<Integer,Integer> getTaskWCount(long userId,int wCount) {
         Date thirtyDaysAgo = DateUtil.offsetDay(new Date(), -30);
-        return baseMapper.getTaskWCount(userId,wCount,DateUtil.format(thirtyDaysAgo, "yyyy-MM-dd")+" 00:00:00");
+        List<Integer> noRecordTasks = baseMapper.getNoRecordTask(userId, DateUtil.format(thirtyDaysAgo, "yyyy-MM-dd") + " 00:00:00");
+        return baseMapper.getTaskWCount(userId, wCount, DateUtil.format(thirtyDaysAgo, "yyyy-MM-dd") + " 00:00:00", noRecordTasks);
     }
 
     @Override
diff --git a/src/main/resources/mapper/orders/OrdersDao.xml b/src/main/resources/mapper/orders/OrdersDao.xml
index 5cd28465..79ba95f7 100644
--- a/src/main/resources/mapper/orders/OrdersDao.xml
+++ b/src/main/resources/mapper/orders/OrdersDao.xml
@@ -286,7 +286,7 @@
           AND orders.`status` = 1
           AND orders.`pay_way` = 9
           AND orders.create_time > DATE_FORMAT(CURDATE(), '%Y-%m-%d 00:00:00')
-          AND record.order_id IS NULL
+          AND record.source_id IS NULL
         ORDER BY orders.create_time
     </select>
 
@@ -298,7 +298,7 @@
           AND orders.`status` = 1
           AND orders.`pay_way` = 9
           AND orders.create_time > DATE_FORMAT(CURDATE(), '%Y-%m-%d 00:00:00')
-          AND record.order_id IS NULL
+          AND record.source_id IS NULL
         ORDER BY orders.create_time LIMIT 1
     </select>
 
diff --git a/src/main/resources/mapper/userSign/TaskCenterDto.xml b/src/main/resources/mapper/userSign/TaskCenterDto.xml
index 52489664..389a2cc3 100644
--- a/src/main/resources/mapper/userSign/TaskCenterDto.xml
+++ b/src/main/resources/mapper/userSign/TaskCenterDto.xml
@@ -2,19 +2,38 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sqx.modules.userSign.dao.UserSignRecordDao">
 
+    <select id="getNoRecordTask" resultType="List">
+        SELECT
+            sign.id
+        FROM
+            user_sign_record sign
+                LEFT JOIN task_center_record cenRecord ON sign.id = cenRecord.source_id
+        WHERE
+            sign.`DAY` = 7
+          AND sign.user_id = #{userId}
+          and sign.create_time &gt; #{time}
+          AND cenRecord.id IS NULL
+        order by sign.create_time asc
+    </select>
+
     <select id="getTaskWCount" resultType="Map">
         SELECT
             sign.id,
-            #{wCount} - COUNT(CASE WHEN cenRecord.id IS NULL and record.source_id IS NOT NULL THEN 1 END) AS record_count
-
+            #{wCount} - COUNT(CASE WHEN spRecord.source_id IS NOT NULL THEN 1 END) AS record_count
         FROM
             user_sign_record sign
-                LEFT JOIN task_center_record cenRecord on sign.id = cenRecord.source_id
                 LEFT JOIN disc_spinning_record spRecord ON sign.id = spRecord.source_id
         WHERE
-            sign.`DAY` = 7;
-        AND sign.user_id = #{userId}
-        and sign.create_time &gt; #{time}
+                sign.`DAY` = 7
+            AND sign.user_id = #{userId}
+            AND sign.create_time &gt; #{time}
+            <if test="ids!= null and ids.size() > 0">
+                AND sign.id in
+                <foreach collection="ids" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+        GROUP BY sign.id
         order by sign.create_time asc
     </select>