puzhibing
2026-08-18 09091079f002ec00f1faefac6d6355e31ab9502c
fix: align franchisee dashboard order statistics
1个文件已修改
8 ■■■■■ 已修改文件
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -3615,9 +3615,9 @@
            ArrayIndexOutOfBoundsException:17 / "is not being grouped" 规划崩溃;
         2) 聚合表达式内禁用 LEAST(),LEAST(ROUND(...)) 会触发 NPE,用嵌套 CASE 等价封顶替代。 -->
    <!-- 按 end_time 日聚合: 关键数据收入/服务费/总充电电量与管理后台 chargingOrderBaseSummary 保持一致 -->
    <!-- 按 pay_time 日聚合: 关键数据收入/服务费/总充电电量与管理后台 chargingOrderBaseSummary 保持一致 -->
    <select id="franchiseeDayStats" resultType="com.ruoyi.order.dto.FranchiseeDayStat">
        SELECT DATE(b.end_time)                       AS statDay,
        SELECT DATE(b.pay_time)                       AS statDay,
               COUNT(*)                               AS orderCount,
               SUM(IFNULL(b.order_amount, 0))         AS orderAmount,
               SUM(COALESCE(b.order_amount, b.payment_amount)) AS orderAmountEffective,
@@ -3657,8 +3657,8 @@
                #{siteId}
            </foreach>
        </if>
          AND b.end_time &gt;= #{start}
          AND b.end_time &lt; #{end}
          AND b.pay_time &gt;= #{start}
          AND b.pay_time &lt; #{end}
        GROUP BY 1
    </select>