From 1dc9e16c55427a40879145bfe9338fe638bd7e05 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 22 Jul 2025 14:37:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=EF=BC=9A=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=94=AF=E4=BB=98=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BB=8A=E5=A4=A9=E6=94=AF=E4=BB=98=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/mobile/impl/GoodsServiceImpl.java |  3 +++
 .../resources/mapper/StatisticsMapper.xml     | 21 +++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
index be224dc..fa98c80 100644
--- a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
@@ -279,6 +279,9 @@ public class GoodsServiceImpl implements GoodsService {
             }
         }
         TaskEntity task = videoTaskRepository.getTaskById(videoRespVO.getTaskId());
+        if (task == null) {
+            return ApiResponse.fail("该vlog不存在或已失效");
+        }
         JSONObject paramJson = JSON.parseObject(task.getTaskParams());
         AtomicInteger deviceCount = new AtomicInteger();
         goodsDetailVO.setShotTime(taskTaskService.getTaskShotDate(task.getId()));
diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index 1384da6..5c153df 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -12,10 +12,10 @@
         where
             (status = 1 or status = 2) and scenic_id = #{scenicId}
             <if test="startTime!= null">
-                and create_at >= #{startTime}
+                and pay_at >= #{startTime}
             </if>
             <if test="endTime!= null">
-                and create_at &lt;= #{endTime}
+                and pay_at &lt;= #{endTime}
             </if>
     </select>
     <select id="countPreviewVideoOfMember" resultType="java.lang.Integer">
@@ -61,17 +61,20 @@
         SELECT
         IFNULL(count(1), 0) AS count
         FROM (
-        select count(1) as count
-        from `order`
-        where scenic_id = #{scenicId}
+        select 1
+        FROM `t_stats_record` r
+        left join `t_stats` s on r.trace_id=s.trace_id
+        where r.trace_id in (select trace_id from `t_stats_record` where action = 'ENTER_SCENIC' and `identifier`=#{scenicId})
+        and action = 'CLICK'
+        and identifier = 'BUY'
         <if test="startTime!= null">
-            and create_at >= #{startTime}
+            and s.create_time >= #{startTime}
         </if>
         <if test="endTime!= null">
-            and create_at &lt;= #{endTime}
+            and s.create_time &lt;= #{endTime}
         </if>
-        group by member_id
-        )a
+        group by s.member_id
+        ) AS subquery;
     </select>
     <select id="countPayOfMember" resultType="java.lang.Integer">
         SELECT