feat：同步h5会员详情统计

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -596,7 +596,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND fs_user_company_user.is_repeat_fans = 1 and fs_user.`status` = 1
     </select>
 
-    <select id="getCountWatchCourse" resultType="com.fs.store.vo.h5.UserDetailsVO">
+    <select id="getCountWatchCourse" resultType="UserDetailsVO">
         SELECT
         ifnull( complete_watch_count, 0 ) AS completeWatchCount ,
         ifnull( watch_times, 0 ) AS watchTimes,
@@ -611,14 +611,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     <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>
@@ -629,7 +629,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         fs_user.user_id = #{fsUserId}
     </select>
 
-    <select id="getCountAnswer" resultType="com.fs.store.vo.h5.UserDetailsVO">
+    <select id="getCountAnswer" resultType="UserDetailsVO">
         SELECT
         (
         SELECT
@@ -645,14 +645,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <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>
@@ -676,14 +676,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <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>
@@ -705,20 +705,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
         WHERE
         (company_user.user_id = #{userId} or company_user.parent_id = #{userId} )
-        and fs_course_red_packet_log.status = 1
         <if test="dateTag != null and dateTag !='' ">
             <choose>
                 <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>