feat：会员管理

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

@@ -238,7 +238,7 @@
         SELECT
         b.total_amount,b.last_buy_time,p.pay_money as number,p.payment_id,p.pay_time,
         u.*,
-        fcc.watch_course_count, fcc.part_course_count, company_user.nick_name AS companyUserNickName, fcc.last_watch_date
+        fs_course_watch_log.watch_course_count, fs_course_watch_log.part_course_count, company_user.nick_name AS companyUserNickName, fs_course_watch_log.last_watch_date
         ,company.company_name
         FROM
         fs_user u
@@ -258,16 +258,22 @@
         AND b.payment_id = p.payment_id
         LEFT JOIN (
         SELECT
-        fs_user_course_count.user_id,Max( fs_user_course_count.last_watch_date ) AS last_watch_date,fs_user_course_count.watch_course_count,
-        fs_user_course_count.part_course_count
+        fs_course_watch_log.user_id,
+        Max( fs_course_watch_log.last_heartbeat_time ) AS last_watch_date,
+        count( DISTINCT fs_course_watch_log.video_id ) watch_course_count,
+        count( DISTINCT fs_course_watch_log.period_id ) part_course_count
         FROM
-        fs_user_course_count
-        GROUP BY fs_user_course_count.user_id
-        ) fcc ON fcc.user_id = u.user_id
+        fs_course_watch_log
+        GROUP BY
+        fs_course_watch_log.user_id
+        ) fs_course_watch_log ON fs_course_watch_log.user_id = u.user_id
         LEFT JOIN company_user ON company_user.user_id = u.company_user_id
         LEFT JOIN company on company.company_id = company_user.company_id
         <where>
         1 = 1
+        <if test = "maps.userId != null">
+            AND u.user_id LIKE CONCAT("%",#{maps.userId},"%")
+        </if >
         <if test = "maps.nickname != null and  maps.nickname !='' " >
             AND u.nickname LIKE CONCAT("%",#{maps.nickname},"%")
         </if >