From 04585acb4f7af05e9a944c2914a8550963fbcf59 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 六月 2025 09:16:41 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
index 76c469e..ff87890 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -401,17 +401,34 @@
LEFT JOIN se_client_card card ON card.id = ope.card_id
LEFT JOIN se_payment_method pay ON pay.id = ope.payment_id
LEFT JOIN ba_user user ON user.id = ope.operator
- WHERE ope.operate_valid = 2 AND ope.operate_type in (1,2,3) AND cardNum = #{cardNum,jdbcType=BIGINT}
- <!-- SELECT *-->
- <!-- FROM v_operate-->
- <!-- WHERE cardNum = #{cardNum,jdbcType=BIGINT}-->
+<!-- WHERE ope.operate_valid = 2 AND ope.operate_type in (1,2,3) AND cardNum = #{cardNum,jdbcType=BIGINT}-->
+ <where>
+ AND ope.operate_valid = 2
+ AND ope.operate_type in (1,2,3)
+ <if test="cardNum != null and cardNum != ''">
+ AND card.cardNum = #{cardNum}
+ </if>
+
+ <if test="cardAddr != null and cardAddr != ''">
+ AND card.cardAddr = #{cardAddr}
+ </if>
+ </where>
</select>
<!--鏍规嵁姘村崱缂栧彿鑾峰彇浣欓-->
<select id="getMoneyByCardNum" resultType="java.lang.Float">
SELECT money
FROM se_client_card
- WHERE cardNum = #{cardNum,jdbcType=BIGINT}
+<!-- WHERE cardNum = #{cardNum,jdbcType=BIGINT}-->
+ <where>
+ <if test="cardNum != null and cardNum != ''">
+ AND cardNum = #{cardNum}
+ </if>
+
+ <if test="cardAddr != null and cardAddr != ''">
+ AND cardAddr = #{cardAddr}
+ </if>
+ </where>
</select>
<!--鏍规嵁姘村崱缂栧彿鑾峰彇鍏呭�兼�婚-->
@@ -419,7 +436,16 @@
SELECT SUM(his.amount) AS amount
FROM se_recharge_history his
INNER JOIN se_client_card card ON his.cardId = card.id
- WHERE card.cardNum = #{cardNum,jdbcType=BIGINT}
+<!-- WHERE card.cardNum = #{cardNum,jdbcType=BIGINT}-->
+ <where>
+ <if test="cardNum != null and cardNum != ''">
+ AND card.cardNum = #{cardNum}
+ </if>
+
+ <if test="cardAddr != null and cardAddr != ''">
+ AND card.cardAddr = #{cardAddr}
+ </if>
+ </where>
</select>
<!--鏍规嵁姘村崱缂栧彿鑾峰彇鍗＄墖鐘舵�侊細1-寮�鍗★紝2-琛ュ崱锛�3-鍏呭�硷紝4-鎸傚け锛�5-娉ㄩ攢锛�6-瑙ｉ攣锛�7-鍐叉锛�8-娑堣垂-->
--
Gitblit v1.8.0