From 5202ec3be1189a5df7dfe64e29c23b861d6b3313 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 8 Aug 2025 17:28:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/pc/StatisticsController.java   | 14 ++++++++++
 .../mobile/impl/AppStatisticsServiceImpl.java |  4 ++-
 .../resources/mapper/StatisticsMapper.xml     | 26 ++++++++++++++-----
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/controller/pc/StatisticsController.java b/src/main/java/com/ycwl/basic/controller/pc/StatisticsController.java
index 9d495ee..13666fc 100644
--- a/src/main/java/com/ycwl/basic/controller/pc/StatisticsController.java
+++ b/src/main/java/com/ycwl/basic/controller/pc/StatisticsController.java
@@ -1,6 +1,7 @@
 package com.ycwl.basic.controller.pc;
 
 import com.ycwl.basic.model.mobile.statistic.req.CommonQueryReq;
+import com.ycwl.basic.service.mobile.AppStatisticsService;
 import com.ycwl.basic.service.pc.StatisticsService;
 import com.ycwl.basic.utils.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,9 @@ public class StatisticsController {
 
     @Autowired
     private StatisticsService statisticsService;
+    
+    @Autowired
+    private AppStatisticsService appStatisticsService;
 
     /**
      * 智能获取扫码访问人数统计数据（自动选择粒度）
@@ -29,4 +33,14 @@ public class StatisticsController {
     public ApiResponse<List<HashMap<String, String>>> getScanCodeMemberChart(@RequestBody CommonQueryReq query) {
         return ApiResponse.success(statisticsService.getScanCodeMemberChartAuto(query));
     }
+
+    @PostMapping("/one")
+    public ApiResponse getStatisticsOne(@RequestBody CommonQueryReq query) {
+        return appStatisticsService.oneStatistics(query);
+    }
+
+    @PostMapping("/two")
+    public ApiResponse getStatisticsTwo(@RequestBody CommonQueryReq query) {
+        return appStatisticsService.twoStatistics(query);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/AppStatisticsServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/AppStatisticsServiceImpl.java
index 99ff5c8..2cbb638 100644
--- a/src/main/java/com/ycwl/basic/service/mobile/impl/AppStatisticsServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/mobile/impl/AppStatisticsServiceImpl.java
@@ -264,7 +264,9 @@ public class AppStatisticsServiceImpl implements AppStatisticsService {
             vo.setPayOfOrderAmount(payOfOrderAmount.setScale(2, RoundingMode.HALF_UP));
             vo.setRefundOfOrderNum(refundOfOrderNum);
             vo.setRefundOfOrderAmount(refundOfOrderAmount.setScale(2, RoundingMode.HALF_UP));
-            statisticsMapper.insertStat(query.getScenicId(), new Date(), vo);
+            if (query.getScenicId() != null) {
+                statisticsMapper.insertStat(query.getScenicId(), new Date(), vo);
+            }
             redisTemplate.opsForValue().set(redisKey, JacksonUtil.toJSONString(vo), 60, TimeUnit.SECONDS);
             return ApiResponse.success(vo);
         } finally {
diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index 3d8aabf..48aecba 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -10,7 +10,10 @@
         select ifnull(sum(pay_price),0) as payPrice
         from `order`
         where
-            (status = 1 or status = 2) and scenic_id = #{scenicId}
+            (status = 1 or status = 2)
+            <if test="scenicId != null">
+                and scenic_id = #{scenicId}
+            </if>
             <if test="startTime!= null">
                 and pay_at >= #{startTime}
             </if>
@@ -95,7 +98,10 @@
         FROM (
         select count(1) as count
         from statistics
-        where type=4 and scenic_id = #{scenicId}
+        where type=4
+        <if test="scenicId != null">
+            and scenic_id = #{scenicId}
+        </if>
         <if test="startTime!= null">
             and create_time >= #{startTime}
         </if>
@@ -111,7 +117,10 @@
         FROM (
         select count(1) as count
             from statistics
-            where type=3 and scenic_id = #{scenicId}
+            where type=3
+            <if test="scenicId != null">
+                and scenic_id = #{scenicId}
+            </if>
             <if test="startTime!= null">
                 and create_time >= #{startTime}
             </if>
@@ -275,7 +284,10 @@
         select ifnull(sum(pay_price),0) as payPrice
         from `order`
         where
-        refund_status = 1  and scenic_id = #{scenicId}
+        refund_status = 1
+        <if test="scenicId != null">
+            and scenic_id = #{scenicId}
+        </if>
         <if test="startTime!= null">
             and create_at >= #{startTime}
         </if>
@@ -315,8 +327,10 @@
     <select id="listStatByScenic" resultType="com.ycwl.basic.model.mobile.statistic.resp.AppStatisticsFunnelVO">
         SELECT cs1 AS cameraShotOfMemberNum, v1 AS totalVisitorOfMemberNum, sv1 AS scanCodeVisitorOfMemberNum, u1 AS uploadFaceOfMemberNum, m1 AS pushOfMemberNum, gv1 AS completeVideoOfMemberNum, gv2 AS completeOfVideoNum, pv1 AS previewVideoOfMemberNum, pv2 AS previewOfVideoNum, cp1 AS clickOnPayOfMemberNum, o1 AS payOfMemberNum, o2 AS payOfOrderNum, o3 AS payOfOrderAmount, ro2 AS refundOfOrderNum, ro3 AS refundOfOrderAmount
         FROM scenic_stats
-        WHERE scenic_id = #{scenicId}
-          AND date BETWEEN #{startTime} AND #{endTime}
+        WHERE date BETWEEN #{startTime} AND #{endTime}
+        <if test="scenicId != null">
+          AND scenic_id = #{scenicId}
+        </if>
     </select>
     <select id="orderChartByDate" resultType="java.util.HashMap">
         WITH RECURSIVE date_series AS (