Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2025-03-20 053492c159a2cb8f12e8a7f59675ef6516d31440

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml

@@ -429,7 +429,12 @@
        ELSE t1.period_service_price * 0.8
        END
        )as period_electric_price,
        SUM(t1.period_electric_price) as total_amount
        SUM(t1.period_electric_price) as total_amount,
        SUM(CASE
        WHEN t2.order_source = 0 THEN 0
        WHEN t2.order_source = 1 THEN 0
        ELSE t1.period_service_price * 0.2
        END) AS commissionAmount
        FROM
        t_charging_order_accounting_strategy t1
        LEFT JOIN t_charging_order t2 on t1.charging_order_id = t2.id