longz
2026-08-05 b9f1781ab4d4278d0f67cce62f0940f6e744a1b5
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -221,7 +221,7 @@
        LocalDateTime[] range = franchiseeRange(params);
        List<FranchiseeDayStat> dayStats = franchiseeDayStats(siteIds, range);
        Map<String, Object> summary = new LinkedHashMap<>();
        summary.put("orderAmountWan", sum(dayStats, FranchiseeDayStat::getOrderAmount).divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP));
        summary.put("orderAmountWan", sum(dayStats, FranchiseeDayStat::getChargingIncome).divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP));
        summary.put("serviceFeeWan", sum(dayStats, FranchiseeDayStat::getServiceFee).divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP));
        summary.put("chargingPowerWan", sum(dayStats, FranchiseeDayStat::getCapacity).divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP));
        summary.put("chargingAmount", sum(dayStats, FranchiseeDayStat::getChargingIncome));
@@ -230,7 +230,7 @@
        summary.put("demandPowerSatisfactionRate", demandPowerSatisfaction(dayStats));
        Map<String, Object> result = new LinkedHashMap<>();
        result.put("summary", summary);
        result.put("keyDataLine", franchiseeDailyTrend(dayStats, range, "订单金额", FranchiseeDayStat::getOrderAmountEffective));
        result.put("keyDataLine", franchiseeDailyTrend(dayStats, range, "收入合计", FranchiseeDayStat::getChargingIncome));
        result.put("keyDataRing", franchiseePhaseRing(siteIds, range));
        result.put("orderStats", franchiseeOrderTrend(dayStats, range));
        result.put("efficiency", franchiseeEfficiencyTrend(dayStats, range));