From 0c9521d93a745de0ec71d83c094a6047c0222398 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 29 十月 2025 15:01:51 +0800
Subject: [PATCH] 调整

---
 framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java |   46 ++++++++++++++++++++++++++++++----------------
 1 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java
index 48b678f..542da4a 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java
@@ -220,6 +220,32 @@
         return result;
     }
 
+//    @Override
+//    public Integer countUv(StatisticsQueryParam queryParam) {
+//        Date[] dates = StatisticsDateUtil.getDateArray(queryParam);
+//        //鑾峰彇褰撳墠鏃堕棿
+//        Calendar calendar = Calendar.getInstance();
+//
+//        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+//        calendar.set(Calendar.MILLISECOND, 0);
+//        //濡傛灉鏄粖澶╃殑缁熻锛屽垯浠巖edis 涓嬁锛屽惁鍒欎粠鏁版嵁搴撲腑鎷�
+//        if (dates[0].equals(calendar.getTime())) {
+//            if (StringUtils.isNotEmpty(queryParam.getStoreId())) {
+//                return cache.counter(CachePrefix.UV.getPrefix() + StatisticsSuffix.suffix(queryParam.getStoreId())).intValue();
+//            }
+//            return cache.counter(CachePrefix.UV.getPrefix() + StatisticsSuffix.suffix()).intValue();
+//        } else {
+//            QueryWrapper queryWrapper = new QueryWrapper();
+//            queryWrapper.between("date", dates[0], dates[1]);
+//            //鏍规嵁搴楅摵鏌ヨ鍒ゅ畾锛屽鏋滄湁锛屽垯搴楅摵鏌ヨ锛屽鏋滄病鏈夛紝鍒欐牴鎹晢瀹舵煡璇�
+//            if (StringUtils.isNotEmpty(queryParam.getStoreId())) {
+//                queryWrapper.eq("store_id", queryParam.getStoreId());
+//            } else {
+//                queryWrapper.eq("store_id", -1);
+//            }
+//            return this.baseMapper.count(queryWrapper);
+//        }
+//    }
     @Override
     public Integer countUv(StatisticsQueryParam queryParam) {
         Date[] dates = StatisticsDateUtil.getDateArray(queryParam);
@@ -228,23 +254,11 @@
 
         calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
         calendar.set(Calendar.MILLISECOND, 0);
-        //濡傛灉鏄粖澶╃殑缁熻锛屽垯浠巖edis 涓嬁锛屽惁鍒欎粠鏁版嵁搴撲腑鎷�
-        if (dates[0].equals(calendar.getTime())) {
-            if (StringUtils.isNotEmpty(queryParam.getStoreId())) {
-                return cache.counter(CachePrefix.UV.getPrefix() + StatisticsSuffix.suffix(queryParam.getStoreId())).intValue();
-            }
-            return cache.counter(CachePrefix.UV.getPrefix() + StatisticsSuffix.suffix()).intValue();
-        } else {
+
             QueryWrapper queryWrapper = new QueryWrapper();
-            queryWrapper.between("date", dates[0], dates[1]);
-            //鏍规嵁搴楅摵鏌ヨ鍒ゅ畾锛屽鏋滄湁锛屽垯搴楅摵鏌ヨ锛屽鏋滄病鏈夛紝鍒欐牴鎹晢瀹舵煡璇�
-            if (StringUtils.isNotEmpty(queryParam.getStoreId())) {
-                queryWrapper.eq("store_id", queryParam.getStoreId());
-            } else {
-                queryWrapper.eq("store_id", -1);
-            }
-            return this.baseMapper.count(queryWrapper);
-        }
+            queryWrapper.between("start_time", dates[0], dates[1]);
+            queryWrapper.eq("page_status", "JOIN");
+            return this.baseMapper.uvCount(queryWrapper);
     }
 
     /**

--
Gitblit v1.8.0