调整

peng

2025-10-29 0c9521d93a745de0ec71d83c094a6047c0222398

 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);
//        //如果是今天的统计，则从redis 中拿，否则从数据库中拿
//        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);
        //如果是今天的统计，则从redis 中拿，否则从数据库中拿
        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);
    }

    /**