Merge remote-tracking branch 'origin/master'

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -653,14 +653,14 @@
                 <when test = "dateTag == '今天'">
                     and to_days(fs_user_course_count.create_time) = to_days(now())
                 </when>
-                <when test = "dateTag == ' 昨天'">
-                    and to_days(now()) - to_days(fs_user_course_count.create_time) &lt;= 1
+                <when test = "dateTag == '昨天'">
+                    and fs_user_course_count.create_time &gt;= CURDATE() - INTERVAL 1 DAY AND fs_user_course_count.create_time &lt; CURDATE()
                 </when>
                 <when test = "dateTag == '前天'">
-                    and to_days(now()) - to_days(fs_user_course_count.create_time) &lt;= 2
+                    and fs_user_course_count.create_time &gt;= CURDATE() - INTERVAL 2 DAY AND fs_user_course_count.create_time &lt; CURDATE() - INTERVAL 1 DAY
                 </when>
                 <when test = "dateTag == '近七天'">
-                    and DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt;= date(fs_user_course_count.create_time)
+                    and fs_user_course_count.create_time &gt;= CURDATE() - INTERVAL 7 DAY
                 </when>
             </choose>
         </if>
@@ -687,14 +687,14 @@
                             <when test = "dateTag == '今天'">
                                 and to_days(fs_course_answer_logs.create_time) = to_days(now())
                             </when>
-                            <when test = "dateTag == ' 昨天'">
-                                and to_days(now()) - to_days(fs_course_answer_logs.create_time) &lt;= 1
+                            <when test = "dateTag == '昨天'">
+                                and fs_course_answer_logs.create_time &gt;= CURDATE() - INTERVAL 1 DAY AND fs_course_answer_logs.create_time &lt; CURDATE()
                             </when>
                             <when test = "dateTag == '前天'">
-                                and to_days(now()) - to_days(fs_course_answer_logs.create_time) &lt;= 2
+                                and fs_course_answer_logs.create_time &gt;= CURDATE() - INTERVAL 2 DAY AND fs_course_answer_logs.create_time &lt; CURDATE() - INTERVAL 1 DAY
                             </when>
                             <when test = "dateTag == '近七天'">
-                                and DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt;= date(fs_course_answer_logs.create_time)
+                                and fs_course_answer_logs.create_time &gt;= CURDATE() - INTERVAL 7 DAY
                             </when>
                         </choose>
                     </if>
@@ -718,14 +718,14 @@
                         <when test = "dateTag == '今天'">
                             and to_days(fs_course_answer_logs.create_time) = to_days(now())
                         </when>
-                        <when test = "dateTag == ' 昨天'">
-                            and to_days(now()) - to_days(fs_course_answer_logs.create_time) &lt;= 1
+                        <when test = "dateTag == '昨天'">
+                            and fs_course_answer_logs.create_time &gt;= CURDATE() - INTERVAL 1 DAY AND fs_course_answer_logs.create_time &lt; CURDATE()
                         </when>
                         <when test = "dateTag == '前天'">
-                            and to_days(now()) - to_days(fs_course_answer_logs.create_time) &lt;= 2
+                            and fs_course_answer_logs.create_time &gt;= CURDATE() - INTERVAL 2 DAY AND fs_course_answer_logs.create_time &lt; CURDATE() - INTERVAL 1 DAY
                         </when>
                         <when test = "dateTag == '近七天'">
-                            and DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt;= date(fs_course_answer_logs.create_time)
+                            and fs_course_answer_logs.create_time &gt;= CURDATE() - INTERVAL 7 DAY
                         </when>
                     </choose>
                 </if>
@@ -753,14 +753,14 @@
                     <when test = "dateTag == '今天'">
                         and to_days(fs_course_red_packet_log.create_time) = to_days(now())
                     </when>
-                    <when test = "dateTag == ' 昨天'">
-                        and to_days(now()) - to_days(fs_course_red_packet_log.create_time) &lt;= 1
+                    <when test = "dateTag == '昨天'">
+                        and fs_course_red_packet_log.create_time &gt;= CURDATE() - INTERVAL 1 DAY AND fs_course_red_packet_log.create_time &lt; CURDATE()
                     </when>
                     <when test = "dateTag == '前天'">
-                        and to_days(now()) - to_days(fs_course_red_packet_log.create_time) &lt;= 2
+                        and fs_course_red_packet_log.create_time &gt;= CURDATE() - INTERVAL 2 DAY AND fs_course_red_packet_log.create_time &lt; CURDATE() - INTERVAL 1 DAY
                     </when>
                     <when test = "dateTag == '近七天'">
-                        and DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt;= date(fs_course_red_packet_log.create_time)
+                        and fs_course_red_packet_log.create_time &gt;= CURDATE() - INTERVAL 7 DAY
                     </when>
                 </choose>
             </if>