From f74db84df0e3797e0a2db1faa50adcb778a5150a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 六月 2025 11:33:35 +0800
Subject: [PATCH] 1、完善水肥、墒情、气象相关Mapper代码； 2、解决表阀一体机远程关阀出现的订单号不一致专制不能关阀问题（王江海测试发现）。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 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 e595e8f..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-娑堣垂-->
@@ -868,7 +894,7 @@
<!--妫�鏌ュ崱鍦板潃鏄惁宸插瓨鍦紙绠＄悊鍗¤〃 + 鍐滄埛姘村崱琛級-->
<select id="checkCardAddrExists" resultType="java.lang.Long">
SELECT COUNT(*) AS totalCount FROM (
- -- 妫�鏌ョ鐞嗗崱琛ㄤ腑姝ｅ父(1)鍜屾寕澶�(3)鐘舵�佺殑璁板綍
+ -- 妫�鏌ョ鐞嗗崱琛ㄤ腑姝ｅ父(1)鍜屾寕澶�(3)鐘舵�佺殑璁板綍锛屾帓闄ゅ凡娉ㄩ攢(2)鍜屾湭鍐欏崱(4)
SELECT card_addr FROM se_management_card
WHERE card_addr = #{cardAddr}
AND state IN (1, 3)
--
Gitblit v1.8.0