From 40d71f5193f5ee4d69854a17c774eecdcff72fe9 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 03 七月 2024 16:41:12 +0800
Subject: [PATCH] 2024-07-03 朱宝民 获取充值记录包含开卡记录
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 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 33c7923..00047cf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -235,10 +235,10 @@
select
COUNT(*) AS recordCount
FROM se_card_operate ope
- 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
- Left JOIN se_payment_method pay ON ope.payment_id = pay.id
+ 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
+ Left JOIN se_payment_method pay ON ope.payment_id = pay.id
<where>
AND ope.operate_type in(2, 5)
<if test = "clientName != null and clientName !=''">
@@ -253,20 +253,19 @@
AND card.cardNum like CONCAT('%',#{cardNum},'%')
</if>
-<!-- <if test = "paymentId != null and paymentId > 0">-->
-<!-- AND ope.payment_id = ${paymentId}-->
-<!-- </if>-->
+ <!-- <if test = "paymentId != null and paymentId > 0">-->
+ <!-- AND ope.payment_id = ${paymentId}-->
+ <!-- </if>-->
-<!-- <if test = "rechargeTimeStart != null and rechargeTimeStop != null">-->
-<!-- AND ope.operate_dt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}-->
-<!-- </if>-->
+ <!-- <if test = "rechargeTimeStart != null and rechargeTimeStop != null">-->
+ <!-- AND ope.operate_dt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}-->
+ <!-- </if>-->
</where>
</select>
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍏呭�艰褰�-->
<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,
@@ -275,26 +274,30 @@
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,
+ IFNULL(ope.card_cost,0) 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,
(CASE
- WHEN ope.operate_type = 2 THEN "鍏呭��"
- WHEN ope.operate_type = 5 THEN "杩旇繕"
+ WHEN ope.operate_type = 1 THEN "寮�鍗�"
+ WHEN ope.operate_type = 2 THEN "鍏呭��"
+ WHEN ope.operate_type = 5 THEN "杩旇繕"
END) AS operateType,
ope.operate_dt
FROM se_card_operate ope
- 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
- Left JOIN se_payment_method pay ON ope.payment_id = pay.id
+ 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
+ Left JOIN se_payment_method pay ON ope.payment_id = pay.id
<where>
- AND ope.operate_type in(2, 5)
+ AND ope.operate_type in(1, 2, 5)
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
--
Gitblit v1.8.0