From 3244b550596e0330031b3f4547356927df83b0ad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 19 五月 2025 11:48:35 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 111 ++++++++++++++++++++++++++++---------------------------
1 files changed, 56 insertions(+), 55 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 193d5fb..c8284c3 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
@@ -240,68 +240,69 @@
</select>
<select id="getRefundList" resultType="com.ruoyi.order.api.model.TChargingOrderRefund">
-
- select * from (SELECT re.id,
- re.`code`,
- re.refund_code,
- re.refund_title,
- re.refund_reason,
- re.refund_amount,
- re.refund_total_amount,
- re.refund_time,
- re.pay_type,
- re.pay_amount,
- re.refund_remark,
- co.recharge_serial_number as serail_number,
- co.payment_amount,
- co.create_time as pay_time,
- co.id as order_id,
- co.app_user_id as user_id,
- 1 as type
+ select * from (
+ SELECT
+ re.id,
+ re.`code`,
+ re.refund_code,
+ re.refund_title,
+ re.refund_reason,
+ re.refund_amount,
+ re.refund_total_amount,
+ re.refund_time,
+ re.pay_type,
+ re.pay_amount,
+ re.refund_remark,
+ co.recharge_serial_number as serail_number,
+ co.payment_amount,
+ co.create_time as pay_time,
+ co.id as order_id,
+ co.app_user_id as user_id,
+ 1 as type
FROM t_charging_order_refund re
LEFT JOIN t_charging_order co ON re.charging_order_id = co.id
UNION ALL
- SELECT re.id,
- re.`code`,
- re.refund_code,
- re.refund_title,
- re.refund_reason,
- re.refund_amount,
- re.refund_total_amount,
- re.refund_time,
- re.pay_type,
- re.pay_amount,
- re.refund_remark,
- so.serial_number,
- so.payment_amount,
- so.create_time as pay_time,
- so.id as order_id,
- so.app_user_id as user_id,
- 2 as type
+ SELECT
+ re.id,
+ re.`code`,
+ re.refund_code,
+ re.refund_title,
+ re.refund_reason,
+ re.refund_amount,
+ re.refund_total_amount,
+ re.refund_time,
+ re.pay_type,
+ re.pay_amount,
+ re.refund_remark,
+ so.serial_number,
+ so.payment_amount,
+ so.create_time as pay_time,
+ so.id as order_id,
+ so.app_user_id as user_id,
+ 2 as type
FROM t_shopping_order_refund re
LEFT JOIN t_shopping_order so on re.shopping_order_id = so.id
UNION ALL
- SELECT vr.id,
- vr.`code`,
- vr.refund_code,
- vr.refund_title,
- vr.refund_reason,
- vr.refund_amount,
- vr.refund_total_amount,
- vr.refund_time,
- vr.pay_type,
- vr.pay_amount,
- vr.refund_remark,
- vo.serial_number,
- vo.payment_amount,
- vo.create_time as pay_time,
- vo.id as order_id,
- vo.app_user_id as user_id,
- 3 as type
+ SELECT
+ vr.id,
+ vr.`code`,
+ vr.refund_code,
+ vr.refund_title,
+ vr.refund_reason,
+ vr.refund_amount,
+ vr.refund_total_amount,
+ vr.refund_time,
+ vr.pay_type,
+ vr.pay_amount,
+ vr.refund_remark,
+ vo.serial_number,
+ vo.payment_amount,
+ vo.create_time as pay_time,
+ vo.id as order_id,
+ vo.app_user_id as user_id,
+ 3 as type
FROM t_vip_order_refund vr
LEFT JOIN t_vip_order vo on vr.vip_order_id = vo.id
-
-
) o
<where>
<if test="data.code != null and data.code != ''">
@@ -1626,7 +1627,7 @@
tc.name as name,
cp.name AS siteName
FROM
- `charging_pile_order`.`t_charging_order` co
+ (select site_id,create_time,charging_gun_id, charging_pile_id, current, (CASE WHEN need_elec = 0 THEN `current` ELSE need_elec END) as need_elec from `charging_pile_order`.`t_charging_order`) co
LEFT JOIN `charging_pile_service`.`t_charging_gun` tc ON co.charging_gun_id = tc.id
LEFT JOIN `charging_pile_service`.`t_charging_pile` cp ON tc.charging_pile_id = cp.id
<where>
--
Gitblit v1.7.1