From 7befe07e70922c021a19c15363b253a3cd5a3d85 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 3 Jan 2025 19:29:57 +0800
Subject: [PATCH] gaigai

---
 .../impl/mobile/AppStatisticsServiceImpl.java   |  3 +++
 src/main/resources/mapper/StatisticsMapper.xml  | 17 +++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/AppStatisticsServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/AppStatisticsServiceImpl.java
index 6e28dfc..c9c3d8f 100644
--- a/src/main/java/com/ycwl/basic/service/impl/mobile/AppStatisticsServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/impl/mobile/AppStatisticsServiceImpl.java
@@ -156,6 +156,9 @@ public class AppStatisticsServiceImpl implements AppStatisticsService {
         vo.setPom_cvom((calculateConversionRate(completeVideoOfMemberNum,pushOfMemberNum)));
         //预览视频人数
         Integer previewVideoOfMemberNum =statisticsMapper.countPreviewVideoOfMember(query);
+        if (previewVideoOfMemberNum==null){
+            previewVideoOfMemberNum=0;
+        }
         //生成视频人数_预览视频人数_转化率
         vo.setCvom_pvom((calculateConversionRate(previewVideoOfMemberNum,completeVideoOfMemberNum)));
         //点击购买人数
diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index 959e76a..1918f28 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -20,7 +20,7 @@
     </select>
     <select id="countPreviewVideoOfMember" resultType="java.lang.Integer">
         SELECT
-        IFNULL(SUM(count), 0) AS count
+        IFNULL(count(count), 0) AS count
         FROM (
             select count(1) as count
             from statistics
@@ -153,18 +153,19 @@
             </if>
     </select>
     <select id="countCompleteVideoOfMember" resultType="java.lang.Integer">
-        select ifnull(sum(count),0) as count
+        select ifnull(count(1),0) as count
         from(
-            select count(1) as count
-            from video
-            where scenic_id = #{scenicId}
+            select member_video.member_id
+            from member_video
+            left join video on member_video.video_id = video.id
+            where member_video.scenic_id = #{scenicId}
             <if test="startTime!= null">
-                and create_time >= #{startTime}
+                and video.create_time >= #{startTime}
             </if>
             <if test="endTime!= null">
-                and create_time &lt;= #{endTime}
+                and video.create_time &lt;= #{endTime}
             </if>
-            group by member_id
+            group by member_video.member_id
         )a
     </select>
     <select id="countTotalVisitorOfMember" resultType="java.lang.Integer">