Merge remote-tracking branch 'origin/test' into test

src/main/resources/mapper/orders/OrdersDao.xml

@@ -281,12 +281,12 @@
     <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
           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>
 

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="getTaskWCount" resultType="Map">
+    <select id="getNoRecordTask" resultType="Long">
         SELECT
-            sign.id,
-            #{wCount} - COUNT(CASE WHEN cenRecord.id IS NULL and record.source_id IS NOT NULL THEN 1 END) AS record_count
-
+            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="com.sqx.modules.userSign.entity.UserSignRecord">
+        SELECT
+            sign.id as id,
+            #{wCount} - COUNT(CASE WHEN spRecord.source_id IS NOT NULL THEN 1 END) AS `day`
         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>