From b609239eb3c722500ae4e942f66784ec95e846be Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 19 九月 2024 11:07:32 +0800
Subject: [PATCH] 2024-09-19 朱宝民 修改监测控制模块及微信小程序模块tag获取方式，开阀代码优化
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 132 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 120 insertions(+), 12 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 0d22785..77b6343 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -275,10 +275,6 @@
cli.address,
card.money,
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,
@@ -310,14 +306,6 @@
<if test = "cardNum != null and cardNum !=''">
AND card.cardNum like CONCAT('%',#{cardNum},'%')
</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>-->
</where>
ORDER BY ope.operate_dt DESC
<trim prefix="limit " >
@@ -894,4 +882,124 @@
</if>
</trim>
</select>
+
+ <!--鑾峰彇鍏呭�艰褰曟暟閲忥紝绠＄悊骞冲彴鍏呭�煎垪琛ㄤ娇鐢紝APP鏈娇鐢�-->
+ <select id="getRechargesCountNew" resultType="java.lang.Long">
+ SELECT COUNT(*) AS recordCount
+ FROM se_client_card card
+ INNER JOIN se_client cli ON cli.id = card.clientId
+ LEFT JOIN se_recharge_history rch ON rch.cardId = card.id
+ LEFT JOIN se_payment_method pay ON pay.id = rch.paymentId
+ INNER JOIN ba_user us ON us.id = rch.operator
+ <where>
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+
+ <if test = "clientNum != null and clientNum > 0">
+ AND cli.clientNum like CONCAT('%',#{clientNum},'%')
+ </if>
+
+ <if test = "cardNum != null and cardNum !=''">
+ AND card.cardNum like CONCAT('%',#{cardNum},'%')
+ </if>
+ </where>
+ </select>
+
+ <!--鑾峰彇鍏呭�艰褰曪紝绠＄悊骞冲彴鍏呭�煎垪琛ㄤ娇鐢紝APP鏈娇鐢�-->
+ <select id="getRechargesNew" resultType="com.dy.pipIrrGlobal.voSe.VoRechargeNew">
+ SELECT
+ cli.name AS clientName,
+ cli.clientNum,
+ card.cardNum,
+ IFNULL(rch.amount, 0) AS amount,
+ IFNULL(rch.gift, 0) AS gift,
+ IFNULL(rch.afterRecharge, 0) AS afterRecharge,
+ pay.name AS paymentName,
+ us.name AS operator,
+ rch.operateDt AS operateTime
+ FROM se_client_card card
+ INNER JOIN se_client cli ON cli.id = card.clientId
+ LEFT JOIN se_recharge_history rch ON rch.cardId = card.id
+ LEFT JOIN se_payment_method pay ON pay.id = rch.paymentId
+ INNER JOIN ba_user us ON us.id = rch.operator
+ <where>
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+
+ <if test = "clientNum != null and clientNum > 0">
+ AND cli.clientNum like CONCAT('%',#{clientNum},'%')
+ </if>
+
+ <if test = "cardNum != null and cardNum !=''">
+ AND card.cardNum like CONCAT('%',#{cardNum},'%')
+ </if>
+ </where>
+ ORDER BY rch.operateDt DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
+ <!--鑾峰彇杩旇繕璁板綍鏁伴噺锛岀鐞嗗钩鍙板厖鍊煎垪琛ㄤ娇鐢�-->
+ <select id="getRefundsCount" resultType="java.lang.Long">
+ SELECT COUNT(*) AS recordCount
+ FROM se_client_card card
+ INNER JOIN se_client cli ON cli.id = card.clientId
+ LEFT JOIN se_card_operate ope ON ope.card_id = card.id
+ INNER JOIN ba_user us ON us.id = ope.operator
+ <where>
+ AND ope.operate_type = 5
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+
+ <if test = "clientNum != null and clientNum > 0">
+ AND cli.clientNum like CONCAT('%',#{clientNum},'%')
+ </if>
+
+ <if test = "cardNum != null and cardNum !=''">
+ AND card.cardNum like CONCAT('%',#{cardNum},'%')
+ </if>
+ </where>
+ </select>
+
+ <!--鑾峰彇杩旇繕璁板綍锛岀鐞嗗钩鍙板厖鍊煎垪琛ㄤ娇鐢�-->
+ <select id="getRefunds" resultType="com.dy.pipIrrGlobal.voSe.VoRefund">
+ SELECT
+ cli.name AS clientName,
+ cli.clientNum,
+ card.cardNum,
+ IFNULL(ope.money, 0) AS money,
+ IFNULL(ope.refund_amount, 0) AS refundAmount,
+ us.name AS operator,
+ ope.operate_dt AS operateTime
+ FROM se_client_card card
+ INNER JOIN se_client cli ON cli.id = card.clientId
+ LEFT JOIN se_card_operate ope ON ope.card_id = card.id
+ INNER JOIN ba_user us ON us.id = ope.operator
+ <where>
+ AND ope.operate_type = 5
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+
+ <if test = "clientNum != null and clientNum > 0">
+ AND cli.clientNum like CONCAT('%',#{clientNum},'%')
+ </if>
+
+ <if test = "cardNum != null and cardNum !=''">
+ AND card.cardNum like CONCAT('%',#{cardNum},'%')
+ </if>
+ </where>
+ ORDER BY ope.operate_dt DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0