From 45109a672b4946a059bac111d3a61a87e1886274 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 29 七月 2026 11:12:52 +0800
Subject: [PATCH] 各类修复
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index 7f24b82..c6a986f 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -449,28 +449,22 @@
</select>
<select id="chargeCurrentMonth" resultType="com.ruoyi.order.dto.SixChargingDto">
- SELECT EXTRACT(MONTH FROM charging_order.create_time) AS MONTH,
- SUM(IFNULL(accounting.period_electric_price, 0)) AS electrovalence,
- SUM(CASE
- WHEN charging_order.order_source = 2
- THEN IFNULL(accounting.period_service_price, 0) * 0.8
- ELSE IFNULL(accounting.period_service_price, 0)
- END) AS service_charge
- FROM t_charging_order_accounting_strategy accounting
- INNER JOIN t_charging_order charging_order
- ON accounting.charging_order_id = charging_order.id
- WHERE charging_order.del_flag = 0
- AND charging_order.status = 5
- AND charging_order.recharge_payment_status = 2
- AND charging_order.create_time >= DATE_FORMAT(CURDATE(), '%Y-%m-01')
- AND charging_order.create_time <= NOW()
- <if test="siteIds != null and siteIds.size() > 0">
- AND charging_order.site_id IN
- <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
- #{siteId}
- </foreach>
+ SELECT DATE_FORMAT(CURDATE(), '%m') AS MONTH,
+ IFNULL(SUM(IFNULL(electrovalence, 0)), 0) AS electrovalence,
+ IFNULL(SUM(CASE
+ WHEN order_source = 2
+ THEN IFNULL(service_charge, 0) * 0.8
+ ELSE IFNULL(service_charge, 0)
+ END), 0) AS service_charge
+ FROM t_charging_order
+ WHERE del_flag = 0
+ AND status = 5
+ AND recharge_payment_status = 2
+ AND create_time >= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+ AND create_time <= NOW()
+ <if test="siteIdsCsv != null and siteIdsCsv != ''">
+ AND site_id IN (${siteIdsCsv})
</if>
- GROUP BY EXTRACT(MONTH FROM charging_order.create_time)
</select>
<select id="circle" resultType="com.ruoyi.order.dto.SixCircleDto">
--
Gitblit v1.7.1