feat: 首页-统计 改成企微和个微

fs-service-system/src/main/java/com/fs/statis/service/impl/StatisticsServiceImpl.java

@@ -60,22 +60,22 @@ public class StatisticsServiceImpl implements IStatisticsService {
 
 
     public void analysisPreviewTask0(){
-        analysisPreviewTask(0,0);
         analysisPreviewTask(0,1);
+        analysisPreviewTask(0,2);
     }
 
     public void analysisPreviewTask1(){
-        analysisPreviewTask(0,0);
-        analysisPreviewTask(1,0);
-        analysisPreviewTask(2,0);
-        analysisPreviewTask(3,0);
-        analysisPreviewTask(4,0);
-
         analysisPreviewTask(0,1);
         analysisPreviewTask(1,1);
         analysisPreviewTask(2,1);
         analysisPreviewTask(3,1);
         analysisPreviewTask(4,1);
+
+        analysisPreviewTask(0,2);
+        analysisPreviewTask(1,2);
+        analysisPreviewTask(2,2);
+        analysisPreviewTask(3,2);
+        analysisPreviewTask(4,2);
     }
 
 
@@ -115,6 +115,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
         param.setStartTime(startDate);
         param.setEndTime(endDate);
         param.setType(type);
+        param.setUserType(userType);
 
         AnalysisPreviewDTO analysisPreviewDTO = this.analysisPreview(param);
 
@@ -122,20 +123,20 @@ public class StatisticsServiceImpl implements IStatisticsService {
     }
 
     public void watchEndPlayTrendTask0(){
-        this.watchEndPlayTrendTask(0,0);
         this.watchEndPlayTrendTask(0,1);
+        this.watchEndPlayTrendTask(0,2);
     }
 
     public void watchEndPlayTrendTask1(){
-        this.watchEndPlayTrendTask(1,0);
-        this.watchEndPlayTrendTask(2,0);
-        this.watchEndPlayTrendTask(3,0);
-        this.watchEndPlayTrendTask(4,0);
-
         this.watchEndPlayTrendTask(1,1);
         this.watchEndPlayTrendTask(2,1);
         this.watchEndPlayTrendTask(3,1);
         this.watchEndPlayTrendTask(4,1);
+
+        this.watchEndPlayTrendTask(1,2);
+        this.watchEndPlayTrendTask(2,2);
+        this.watchEndPlayTrendTask(3,2);
+        this.watchEndPlayTrendTask(4,2);
     }
 
 
@@ -185,24 +186,15 @@ public class StatisticsServiceImpl implements IStatisticsService {
 
 
     public void companyWatchCourseTopTenTask0(){
-        companyWatchCourseTopTenTask(0,0,0);
-        companyWatchCourseTopTenTask(0,1,0);
-
-
         companyWatchCourseTopTenTask(0,0,1);
         companyWatchCourseTopTenTask(0,1,1);
+
+
+        companyWatchCourseTopTenTask(0,0,2);
+        companyWatchCourseTopTenTask(0,1,2);
     }
 
     public void companyWatchCourseTopTenTask1(){
-        companyWatchCourseTopTenTask(1,0,0);
-        companyWatchCourseTopTenTask(1,1,0);
-        companyWatchCourseTopTenTask(2,0,0);
-        companyWatchCourseTopTenTask(2,1,0);
-        companyWatchCourseTopTenTask(3,0,0);
-        companyWatchCourseTopTenTask(3,1,0);
-        companyWatchCourseTopTenTask(4,0,0);
-        companyWatchCourseTopTenTask(4,1,0);
-
         companyWatchCourseTopTenTask(1,0,1);
         companyWatchCourseTopTenTask(1,1,1);
         companyWatchCourseTopTenTask(2,0,1);
@@ -212,6 +204,15 @@ public class StatisticsServiceImpl implements IStatisticsService {
         companyWatchCourseTopTenTask(4,0,1);
         companyWatchCourseTopTenTask(4,1,1);
 
+        companyWatchCourseTopTenTask(1,0,2);
+        companyWatchCourseTopTenTask(1,1,2);
+        companyWatchCourseTopTenTask(2,0,2);
+        companyWatchCourseTopTenTask(2,1,2);
+        companyWatchCourseTopTenTask(3,0,2);
+        companyWatchCourseTopTenTask(3,1,2);
+        companyWatchCourseTopTenTask(4,0,2);
+        companyWatchCourseTopTenTask(4,1,2);
+
 
     }
 
@@ -304,113 +305,106 @@ public class StatisticsServiceImpl implements IStatisticsService {
     }
 
     public void watchCourseTopTenTask0(){
-        watchCourseTopTenTask(0,0,0,"DESC");
-        watchCourseTopTenTask(0,0,0,"ASC");
-        watchCourseTopTenTask(0,1,0,"DESC");
-        watchCourseTopTenTask(0,1,0,"ASC");
-        watchCourseTopTenTask(0,2,0,"DESC");
-        watchCourseTopTenTask(0,2,0,"ASC");
-        watchCourseTopTenTask(0,3,0,"DESC");
-        watchCourseTopTenTask(0,3,0,"ASC");
-
-        watchCourseTopTenTask(0,0,0,"DESC");
-        watchCourseTopTenTask(0,0,0,"ASC");
-        watchCourseTopTenTask(0,1,0,"DESC");
-        watchCourseTopTenTask(0,1,0,"ASC");
-        watchCourseTopTenTask(0,2,0,"DESC");
-        watchCourseTopTenTask(0,2,0,"ASC");
-        watchCourseTopTenTask(0,3,0,"DESC");
-        watchCourseTopTenTask(0,3,0,"ASC");
+        watchCourseTopTenTask(0,0,1,"DESC");
+        watchCourseTopTenTask(0,0,1,"ASC");
+        watchCourseTopTenTask(0,1,1,"DESC");
+        watchCourseTopTenTask(0,1,1,"ASC");
+        watchCourseTopTenTask(0,2,1,"DESC");
+        watchCourseTopTenTask(0,2,1,"ASC");
+        watchCourseTopTenTask(0,3,1,"DESC");
+        watchCourseTopTenTask(0,3,1,"ASC");
+
+        watchCourseTopTenTask(0,0,1,"DESC");
+        watchCourseTopTenTask(0,0,1,"ASC");
+        watchCourseTopTenTask(0,1,1,"DESC");
+        watchCourseTopTenTask(0,1,1,"ASC");
+        watchCourseTopTenTask(0,2,1,"DESC");
+        watchCourseTopTenTask(0,2,1,"ASC");
+        watchCourseTopTenTask(0,3,1,"DESC");
+        watchCourseTopTenTask(0,3,1,"ASC");
     }
 
     public void watchCourseTopTenTask1(){
-        watchCourseTopTenTask(1,0,0,"DESC");
-        watchCourseTopTenTask(1,0,0,"ASC");
-
         watchCourseTopTenTask(1,0,1,"DESC");
         watchCourseTopTenTask(1,0,1,"ASC");
 
+        watchCourseTopTenTask(1,0,2,"DESC");
+        watchCourseTopTenTask(1,0,2,"ASC");
 
-        watchCourseTopTenTask(1,1,0,"DESC");
-        watchCourseTopTenTask(1,1,0,"ASC");
 
         watchCourseTopTenTask(1,1,1,"DESC");
         watchCourseTopTenTask(1,1,1,"ASC");
 
-        watchCourseTopTenTask(1,2,0,"DESC");
-        watchCourseTopTenTask(1,2,0,"ASC");
+        watchCourseTopTenTask(1,1,2,"DESC");
+        watchCourseTopTenTask(1,1,2,"ASC");
 
         watchCourseTopTenTask(1,2,1,"DESC");
         watchCourseTopTenTask(1,2,1,"ASC");
 
+        watchCourseTopTenTask(1,2,2,"DESC");
+        watchCourseTopTenTask(1,2,2,"ASC");
 
-        watchCourseTopTenTask(1,3,0,"DESC");
-        watchCourseTopTenTask(1,3,0,"ASC");
 
         watchCourseTopTenTask(1,3,1,"DESC");
         watchCourseTopTenTask(1,3,1,"ASC");
 
-        watchCourseTopTenTask(2,0,0,"DESC");
-        watchCourseTopTenTask(2,0,0,"ASC");
+        watchCourseTopTenTask(1,3,2,"DESC");
+        watchCourseTopTenTask(1,3,2,"ASC");
 
         watchCourseTopTenTask(2,0,1,"DESC");
         watchCourseTopTenTask(2,0,1,"ASC");
 
-        watchCourseTopTenTask(2,1,0,"DESC");
-        watchCourseTopTenTask(2,1,0,"ASC");
+        watchCourseTopTenTask(2,0,2,"DESC");
+        watchCourseTopTenTask(2,0,2,"ASC");
 
         watchCourseTopTenTask(2,1,1,"DESC");
         watchCourseTopTenTask(2,1,1,"ASC");
 
-        watchCourseTopTenTask(2,2,0,"DESC");
-        watchCourseTopTenTask(2,2,0,"ASC");
+        watchCourseTopTenTask(2,1,2,"DESC");
+        watchCourseTopTenTask(2,1,2,"ASC");
 
         watchCourseTopTenTask(2,2,1,"DESC");
         watchCourseTopTenTask(2,2,1,"ASC");
 
+        watchCourseTopTenTask(2,2,2,"DESC");
+        watchCourseTopTenTask(2,2,2,"ASC");
 
-        watchCourseTopTenTask(2,3,0,"DESC");
-        watchCourseTopTenTask(2,3,0,"ASC");
 
         watchCourseTopTenTask(2,3,1,"DESC");
         watchCourseTopTenTask(2,3,1,"ASC");
 
-        watchCourseTopTenTask(3,0,0,"DESC");
-        watchCourseTopTenTask(3,0,0,"ASC");
+        watchCourseTopTenTask(2,3,2,"DESC");
+        watchCourseTopTenTask(2,3,2,"ASC");
 
         watchCourseTopTenTask(3,0,1,"DESC");
         watchCourseTopTenTask(3,0,1,"ASC");
 
-        watchCourseTopTenTask(3,1,0,"DESC");
-        watchCourseTopTenTask(3,1,0,"ASC");
+        watchCourseTopTenTask(3,0,2,"DESC");
+        watchCourseTopTenTask(3,0,2,"ASC");
 
         watchCourseTopTenTask(3,1,1,"DESC");
         watchCourseTopTenTask(3,1,1,"ASC");
 
-        watchCourseTopTenTask(3,2,0,"DESC");
-        watchCourseTopTenTask(3,2,0,"ASC");
+        watchCourseTopTenTask(3,1,2,"DESC");
+        watchCourseTopTenTask(3,1,2,"ASC");
 
         watchCourseTopTenTask(3,2,1,"DESC");
         watchCourseTopTenTask(3,2,1,"ASC");
 
-        watchCourseTopTenTask(3,3,0,"DESC");
-        watchCourseTopTenTask(3,3,0,"ASC");
+        watchCourseTopTenTask(3,2,2,"DESC");
+        watchCourseTopTenTask(3,2,2,"ASC");
 
         watchCourseTopTenTask(3,3,1,"DESC");
         watchCourseTopTenTask(3,3,1,"ASC");
 
-        watchCourseTopTenTask(4,0,0,"DESC");
-        watchCourseTopTenTask(4,0,0,"ASC");
+        watchCourseTopTenTask(3,3,2,"DESC");
+        watchCourseTopTenTask(3,3,2,"ASC");
 
         watchCourseTopTenTask(4,0,1,"DESC");
         watchCourseTopTenTask(4,0,1,"ASC");
 
-        watchCourseTopTenTask(4,1,0,"DESC");
-        watchCourseTopTenTask(4,1,0,"ASC");
-        watchCourseTopTenTask(4,2,0,"DESC");
-        watchCourseTopTenTask(4,2,0,"ASC");
-        watchCourseTopTenTask(4,3,0,"DESC");
-        watchCourseTopTenTask(4,3,0,"ASC");
+        watchCourseTopTenTask(4,0,2,"DESC");
+        watchCourseTopTenTask(4,0,2,"ASC");
 
         watchCourseTopTenTask(4,1,1,"DESC");
         watchCourseTopTenTask(4,1,1,"ASC");
@@ -418,56 +412,63 @@ public class StatisticsServiceImpl implements IStatisticsService {
         watchCourseTopTenTask(4,2,1,"ASC");
         watchCourseTopTenTask(4,3,1,"DESC");
         watchCourseTopTenTask(4,3,1,"ASC");
+
+        watchCourseTopTenTask(4,1,2,"DESC");
+        watchCourseTopTenTask(4,1,2,"ASC");
+        watchCourseTopTenTask(4,2,2,"DESC");
+        watchCourseTopTenTask(4,2,2,"ASC");
+        watchCourseTopTenTask(4,3,2,"DESC");
+        watchCourseTopTenTask(4,3,2,"ASC");
     }
 
 
     public void rewardMoneyTask15Minutes(){
-        rewardMoneyTopTenTask(0,0,0);
-        rewardMoneyTopTenTask(0,1,0);
-
-        rewardMoneyTradeTask(0,0);
-
         rewardMoneyTopTenTask(0,0,1);
         rewardMoneyTopTenTask(0,1,1);
 
         rewardMoneyTradeTask(0,1);
-    }
 
+        rewardMoneyTopTenTask(0,0,2);
+        rewardMoneyTopTenTask(0,1,2);
 
-    public void rewardMoneyTaskEveryday(){
-        rewardMoneyTopTenTask(1,0,0);
-        rewardMoneyTopTenTask(1,1,0);
-
-
-        rewardMoneyTopTenTask(2,0,0);
-        rewardMoneyTopTenTask(2,1,0);
-
-        rewardMoneyTopTenTask(3,0,0);
-        rewardMoneyTopTenTask(3,1,0);
-
-        rewardMoneyTopTenTask(4,0,0);
-        rewardMoneyTopTenTask(4,1,0);
-
-
-        rewardMoneyTradeTask(1,0);
-        rewardMoneyTradeTask(2,0);
-        rewardMoneyTradeTask(3,0);
-        rewardMoneyTradeTask(4,0);
+        rewardMoneyTradeTask(0,2);
+    }
 
 
+    public void rewardMoneyTaskEveryday(){
         rewardMoneyTopTenTask(1,0,1);
         rewardMoneyTopTenTask(1,1,1);
+
+
         rewardMoneyTopTenTask(2,0,1);
         rewardMoneyTopTenTask(2,1,1);
+
         rewardMoneyTopTenTask(3,0,1);
         rewardMoneyTopTenTask(3,1,1);
+
         rewardMoneyTopTenTask(4,0,1);
         rewardMoneyTopTenTask(4,1,1);
 
+
         rewardMoneyTradeTask(1,1);
         rewardMoneyTradeTask(2,1);
         rewardMoneyTradeTask(3,1);
         rewardMoneyTradeTask(4,1);
+
+
+        rewardMoneyTopTenTask(1,0,2);
+        rewardMoneyTopTenTask(1,1,2);
+        rewardMoneyTopTenTask(2,0,2);
+        rewardMoneyTopTenTask(2,1,2);
+        rewardMoneyTopTenTask(3,0,2);
+        rewardMoneyTopTenTask(3,1,2);
+        rewardMoneyTopTenTask(4,0,2);
+        rewardMoneyTopTenTask(4,1,2);
+
+        rewardMoneyTradeTask(1,2);
+        rewardMoneyTradeTask(2,2);
+        rewardMoneyTradeTask(3,2);
+        rewardMoneyTradeTask(4,2);
     }
 
     @Override

fs-service-system/src/main/resources/mapper/statis/ConsumptionBalanceMapper.xml

@@ -79,6 +79,9 @@
              <if test="startTime != null and endTime != null">
                  AND create_time BETWEEN #{startTime} AND #{endTime}
              </if>
+             <if test="userType != null">
+                 and send_type=${userType}
+             </if>
          </where>
     </select>
     <select id="queryAnswerMemberCount" resultType="java.lang.Long">
@@ -113,7 +116,7 @@
         </where>
     </select>
     <select id="queryRewardMoney" resultType="java.math.BigDecimal">
-        select sum(up_money) from company_red_package_logs
+        select sum(up_money) from company_red_package_logs rpl
         left join fs_course_watch_log log
         on rpl.watch_log_id=log.log_id
         <where>
@@ -232,31 +235,36 @@
         SELECT
             -- 按公司
             <if test="dataType == 0">
-                company_id,
+                rpl.company_id as company_id,
             </if>
             -- 按课程
             <if test="dataType == 1">
-                course_id,
+                rpl.course_id as course_id,
             </if>
-            SUM(money) as rewardMoney
+            SUM(rpl.money) as rewardMoney
         FROM
-            company_red_package_logs
+            company_red_package_logs rpl
+        left join fs_course_watch_log log
+        on rpl.watch_log_id=log.log_id
         <where>
-            operate_type = 1
-            AND status = 1
+            rpl.operate_type = 1
+            AND rpl.status = 1
             <if test="startTime != null">
-                AND create_time <![CDATA[>=]]> #{startTime}
+                AND rpl.create_time <![CDATA[>=]]> #{startTime}
             </if>
             <if test="endTime != null">
-                AND create_time <![CDATA[<]]> #{endTime}
+                AND rpl.create_time <![CDATA[<]]> #{endTime}
+            </if>
+            <if test="userType != null">
+                and log.send_type = ${userType}
             </if>
         </where>
         GROUP BY
             <if test="dataType == 0">
-                company_id
+                rpl.company_id
             </if>
             <if test="dataType == 1">
-                course_id
+                rpl.course_id
             </if>
         ORDER BY
             rewardMoney DESC
@@ -266,23 +274,28 @@
         select
         --             今日/昨日 小时
         <if test="type == 0 or type == 1">
-            DATE_FORMAT(create_time, '%H') AS start_date,
+            DATE_FORMAT(rpl.create_time, '%H') AS start_date,
         </if>
         --                 本周/本月/上月 天
         <if test="type == 2 or type == 3 or type == 4">
-            DATE_FORMAT(create_time, '%Y-%m-%d') AS start_date,
+            DATE_FORMAT(rpl.create_time, '%Y-%m-%d') AS start_date,
         </if>
-               SUM(money) as rewardMoney
-        from company_red_package_logs
+               SUM(rpl.money) as rewardMoney
+        from company_red_package_logs rpl
+        left join fs_course_watch_log log
+        on rpl.watch_log_id=log.log_id
         <where>
             <if test="startTime != null">
-                create_time <![CDATA[>=]]> #{startTime}
+                rpl.create_time <![CDATA[>=]]> #{startTime}
             </if>
             <if test="endTime != null">
-                AND create_time <![CDATA[<]]> #{endTime}
+                AND rpl.create_time <![CDATA[<]]> #{endTime}
+            </if>
+            <if test="userType != null">
+                and log.send_type = ${userType}
             </if>
-            AND operate_type = 1
-            AND status = 1
+            AND rpl.operate_type = 1
+            AND rpl.status = 1
         </where>
         group by start_date
     </select>