bug：统计数据修正

刘帅

2026-09-21 3f45e8fdfa31d7b764d60a7c0cb5dd11944ed418

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java

@@ -316,10 +316,12 @@
        Integer statisticsScopeObjectId = statisticsScopeType == 3 ? storeId
                : (statisticsScopeType == 2 ? operatorId : null);

        List<Integer> cityManagerId= new ArrayList<>();
        // 积分商品收入接口按门店 ID 过滤；空集合会被其 SQL 视为“不过滤”，
        // 因此运营商统计必须传入该运营商名下的全部门店，不能传空集合。
        List<Integer> cityManagerId = new ArrayList<>();
        if (Integer.valueOf(2).equals(statisticsScopeType) && statisticsScopeObjectId != null) {
            cityManagerId = storeService.list(new QueryWrapper<TStore>()
                            .eq("cityManagerId", statisticsScopeObjectId).ne("state", 3))
                            .eq("operatorId", statisticsScopeObjectId).ne("state", 3))
                    .stream().map(TStore::getId).collect(Collectors.toList());
        } else if (Integer.valueOf(3).equals(statisticsScopeType) && statisticsScopeObjectId != null) {
            cityManagerId.add(statisticsScopeObjectId);
@@ -1557,9 +1559,29 @@
        objects.add(1);
        objects.add(2);
        vipPaymentLambdaQueryWrapper.in(SiteBooking::getPayType,objects);
        List<SiteBooking> list1 = siteBookingService.list(vipPaymentLambdaQueryWrapper);
        List<SiteBooking> list1 = new ArrayList<>(siteBookingService.list(vipPaymentLambdaQueryWrapper));
        double sum = list1.stream().mapToDouble(SiteBooking::getPayMoney).sum();
        map.put("fee5",sum);

        // 智慧球场支付记录的场地可能只保存在 t_game.siteId。ballClient 已补齐该值，
        // 将其转换为订场明细后可与普通订场一起按场地类型统计。
        GameDataQuery gameDataQuery = new GameDataQuery();
        gameDataQuery.setObjectId(id);
        if (ToolUtil.isNotEmpty(time)) {
            gameDataQuery.setStartTime(time.split(" - ")[0] + " 00:00:00");
            gameDataQuery.setEndTime(time.split(" - ")[1] + " 23:59:59");
        }
        double gameIncome = 0D;
        for (TGameRecord gameRecord : ballClient.getData(gameDataQuery)) {
            if (gameRecord.getSiteId() == null || gameRecord.getMoney() == null || !ids.contains(gameRecord.getSiteId())) {
                continue;
            }
            SiteBooking gameBooking = new SiteBooking();
            gameBooking.setSiteId(gameRecord.getSiteId());
            gameBooking.setPayMoney(gameRecord.getMoney().doubleValue());
            list1.add(gameBooking);
            gameIncome += gameRecord.getMoney().doubleValue();
        }
        map.put("fee5", sum + gameIncome);


        List<Integer> collect = list1.stream().map(SiteBooking::getSiteId).collect(Collectors.toList());
@@ -1820,8 +1842,20 @@
        }
        // 平台智慧球场
        List<TGameRecord> data1 = ballClient.getData(gameDataQuery);
        // 将游戏支付转换为场地收入明细参与后续 siteId -> siteTypeId 分类。
        // fee5 仍由普通订场金额与游戏金额分别相加，避免重复计入总额。
        for (TGameRecord gameRecord : data1) {
            if (gameRecord.getSiteId() == null || gameRecord.getMoney() == null) {
                continue;
            }
            SiteBooking gameBooking = new SiteBooking();
            gameBooking.setSiteId(gameRecord.getSiteId());
            gameBooking.setPayMoney(gameRecord.getMoney().doubleValue());
            list1.add(gameBooking);
        }
        double sum1 = data1.stream()
                .map(TGameRecord::getMoney) // 获取每个 TGameRecord 对象的 money 字段
                .filter(Objects::nonNull)
                .mapToDouble(BigDecimal::doubleValue) // 将 BigDecimal 转换为 double
                .sum();
        map.put("fee5",sum+sum1);