From 83d9b0de6d127cf0f2822c51139fa4e15a3326e7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 07 六月 2025 16:13:34 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java
index c87cb33..6c15b86 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java
@@ -16,8 +16,8 @@
 
 /**
  * @author ZhuBaoMin
- * @date 2023/12/22 16:04
- * @LastEditTime 2023/12/22 16:04
+ * @date 2025-06-06 10:21
+ * @LastEditTime 2025-06-06 10:21
  * @Description
  */
 
@@ -37,6 +37,7 @@
 
     /**
      * 渚濇嵁姘村崱鍦板潃鑾峰彇姘村崱缂栧彿锛�12鏈�19鏃ュ簾寮冿級
+     * 2024-06-30鍙栨秷搴熷純锛屾仮澶嶄娇鐢�
      * @param cardAddr
      * @return
      */
@@ -141,7 +142,7 @@
     List<VoCards> getUnreplaced(Map<?, ?> params);
 
     /**
-     * 鏍规嵁鎸囧畾姘村崱缂栧彿鑾峰彇鎸傚け浜嬭褰曟暟閲忥紙琛ュ崱銆佽В閿佷娇鐢級
+     * 鏍规嵁鎸囧畾姘村崱缂栧彿鑾峰彇鎸傚け璁板綍鏁伴噺锛堣ˉ鍗°�佽В閿佷娇鐢級
      * @param cardNum
      * @return
      */
@@ -191,7 +192,7 @@
     Double getTotalMoneyIcCards();
 
     /**
-     * 鏍规嵁姘村崱鍦板潃鑾峰彇姘村崱鏁伴噺锛岀敤鏉ュ垽鏂鍗℃槸鍚﹀厑璁稿紑鍗�
+     * 鏍规嵁姘村崱鍦板潃鑾峰彇姘村崱鏁伴噺锛岀敤鏉ュ垽鏂鍗℃槸鍚﹀厑璁稿紑鍗★紝鏃犳晥鍗$墖鎺掗櫎鍦ㄥ
      * @param cardAddr
      * @return
      */
@@ -234,4 +235,27 @@
      * @return
      */
     Float getTotalConsumption(@Param("timeStart")String timeStart, @Param("timeStop")String timeStop);
+
+    /**
+     * 渚濇嵁姘村崱鍦板潃灏嗘渶鍚庝竴鏉℃棤鏁堢姸鎬佺殑鎸囧畾鎿嶄綔璁板綍鏀逛负鏈夋晥
+     * @param cardAddr
+     * @param operateType
+     * @return
+     */
+    Integer turnCardValidByAddr(@Param("cardAddr")String cardAddr, @Param("operateType")Integer operateType);
+
+    /**
+     * 鍏呭�兼満鐢ㄦ牴鎹鍗曞彿灏嗘按鍗℃敼涓烘湁鏁�
+     * @param orderNumber
+     * @return
+     */
+    Integer turnCardValidByOrderNumber(@Param("orderNumber")String orderNumber);
+
+    /**
+     * 鏍规嵁姘村崱ID鑾峰彇鍘熸按鍗D锛岃ˉ鍗¢�氱煡涓娇鐢�
+     * @param cardId
+     * @return
+     */
+    Long getOriginalCardIdByCardId(@Param("cardId") Long cardId);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0