From 1cc6ad886f9df129d648b02ff5da1e7ab9b2ded3 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 03 七月 2024 15:57:13 +0800
Subject: [PATCH] 2024-07-03 朱宝民 小程序远程开阀支持扫码开阀
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
index 6c6907e..19345e8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -266,17 +266,22 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍏呭�艰褰�-->
<select id="getRecharges" resultType="com.dy.pipIrrGlobal.voSe.VoRecharge">
SELECT
- CAST(ope.id AS char) AS id,
+ ope.id AS opeId,
+ card.id AS cardId,
cli.name AS clientName,
cli.phone,
cli.idCard,
cli.clientNum,
+ cli.address,
card.money,
- CAST(card.cardNum AS char) AS cardNum,
+ CASE
+ WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))
+ ELSE card.cardNum
+ END AS cardNum,
+ ope2.card_cost AS cardCost,
IFNULL(ope.trade_amount, 0) AS amount,
IFNULL(ope.refund_amount, 0) AS refundAmount,
(IFNULL(ope.money, 0) + IFNULL(ope.trade_amount, 0)) AS afterRecharge,
- -- ope.payment_id AS paymentId,
pay.name AS paymentName,
ope.price,
us.name AS opr,
@@ -289,9 +294,11 @@
INNER JOIN se_client_card card ON ope.card_id = card.id
INNER JOIN se_client cli ON ope.client_id = cli.id
INNER JOIN ba_user us ON ope.operator = us.id
+ INNER JOIN se_card_operate ope2 ON ope2.card_id = ope.card_id
Left JOIN se_payment_method pay ON ope.payment_id = pay.id
<where>
AND ope.operate_type in(2, 5)
+ AND ope2.operate_type = 1
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
--
Gitblit v1.8.0