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/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java |  103 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 88 insertions(+), 15 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 6c15b86..e75da6e 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
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
-import com.dy.pipIrrGlobal.voSe.VoCardInfo;
-import com.dy.pipIrrGlobal.voSe.VoCardInfo1;
-import com.dy.pipIrrGlobal.voSe.VoCards;
-import com.dy.pipIrrGlobal.voSe.VoCards2;
+import com.dy.pipIrrGlobal.voSe.*;
 import com.dy.pipIrrGlobal.voSt.VoCardUsage;
 import com.dy.pipIrrGlobal.voWe.VoCards3;
 import org.apache.ibatis.annotations.Mapper;
@@ -38,6 +35,7 @@
     /**
      * 渚濇嵁姘村崱鍦板潃鑾峰彇姘村崱缂栧彿锛�12鏈�19鏃ュ簾寮冿級
      * 2024-06-30鍙栨秷搴熷純锛屾仮澶嶄娇鐢�
+     * 
      * @param cardAddr
      * @return
      */
@@ -45,6 +43,7 @@
 
     /**
      * 鏍规嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿紙12鏈�19鏃ユ坊鍔犲悗搴熷純锛�
+     * 
      * @param cardNum 16浣嶆按鍗＄紪鍙�
      * @return 姘村崱琛ㄤ富閿�
      */
@@ -52,6 +51,7 @@
 
     /**
      * 鏍规嵁琛屾斂鍖哄垝涓叉ā鍧楁煡璇㈡按鍗＄紪鍙�
+     * 
      * @param areaCode
      * @return
      */
@@ -59,6 +59,7 @@
 
     /**
      * 鏍规嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
+     * 
      * @param cardNum
      * @return
      */
@@ -66,6 +67,7 @@
 
     /**
      * 鏍规嵁姘村崱缂栧彿鑾峰彇姘村崱瀵瑰簲鐨勫啘鎴穒d鍜屽鍚�
+     * 
      * @param cardAddr
      * @param cardNum
      * @return
@@ -74,6 +76,7 @@
 
     /**
      * 寰楀埌姘村崱瀵硅薄
+     * 
      * @param cardAddr
      * @param cardNum
      * @return
@@ -82,6 +85,7 @@
 
     /**
      * 鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃锛堢墿鐞嗗崱+铏氭嫙鍗★級
+     * 
      * @param clientId
      * @return
      */
@@ -89,27 +93,31 @@
 
     /**
      * 鏍规嵁姘村崱缂栧彿鑾峰彇鎿嶄綔璁板綍鍒楄〃
+     * 
      * @param cardNum 姘村崱缂栧彿
      * @return 姘村崱鎿嶄綔璁板綍鍒楄〃
      */
-    List<Map<String, Object>> getOperateRecordsByCardNum(@Param("cardNum") Long cardNum);
+    List<Map<String, Object>> getOperateRecordsByCardNum(@Param("cardNum") Long cardNum, @Param("cardAddr") String cardAddr);
 
     /**
      * 鏍规嵁姘村崱缂栧彿鑾峰彇浣欓
+     * 
      * @param cardNum 姘村崱缂栧彿
      * @return 浣欓
      */
-    Float getMoneyByCardNum(@Param("cardNum") Long cardNum);
+    Float getMoneyByCardNum(@Param("cardNum") Long cardNum, @Param("cardAddr") String cardAddr);
 
     /**
      * 鏍规嵁姘村崱缂栧彿鑾峰彇鍏呭�兼�婚
+     * 
      * @param cardNum
      * @return
      */
-    Float sumRechargeByCardNum(@Param("cardNum") Long cardNum);
+    Float sumRechargeByCardNum(@Param("cardNum") Long cardNum, @Param("cardAddr") String cardAddr);
 
     /**
      * 鏍规嵁姘村崱缂栧彿鑾峰彇鍗＄墖鐘舵��
+     * 
      * @param cardNum
      * @return
      */
@@ -117,6 +125,7 @@
 
     /**
      * 鏍规嵁鎸囧畾鏉′欢鑾峰彇姘村崱鍒楄〃璁板綍鏁帮紝搴旂敤绋嬪簭浣跨敤
+     * 
      * @param params
      * @return
      */
@@ -124,6 +133,7 @@
 
     /**
      * 鏍规嵁鎸囧畾鏉′欢鑾峰彇姘村崱鍒楄〃锛屽簲鐢ㄧ▼搴忎娇鐢�
+     * 
      * @param params
      * @return
      */
@@ -131,18 +141,21 @@
 
     /**
      * 鑾峰彇宸叉寕澶憋紝鏈ˉ鍗＄殑璁板綍鏁伴噺锛屽簲鐢ㄧ▼搴忎娇鐢�
+     * 
      * @return
      */
     Long getUnreplacedRecordCount();
 
     /**
      * 鑾峰彇宸叉寕澶憋紝鏈ˉ鍗＄殑璁板綍锛屽簲鐢ㄧ▼搴忎娇鐢�
+     * 
      * @return
      */
     List<VoCards> getUnreplaced(Map<?, ?> params);
 
     /**
      * 鏍规嵁鎸囧畾姘村崱缂栧彿鑾峰彇鎸傚け璁板綍鏁伴噺锛堣ˉ鍗°�佽В閿佷娇鐢級
+     * 
      * @param cardNum
      * @return
      */
@@ -150,6 +163,7 @@
 
     /**
      * 鏍规嵁鎸囧畾姘村崱缂栧彿鑾峰彇宸茶ˉ鍗℃暟閲忥紙琛ュ崱銆佽В閿佷娇鐢級
+     * 
      * @param cardNum 姘村崱缂栧彿
      * @return 绗﹀悎鏉′欢璁板綍鏁帮紝鏈�澶氫竴鏉�
      */
@@ -157,6 +171,7 @@
 
     /**
      * 鏍规嵁鍐滄埛濮撳悕鍜屾墜鏈哄彿鑾峰彇姘村崱鍒楄〃璁板綍鏁帮紝搴旂敤绋嬪簭浣跨敤
+     * 
      * @param params
      * @return
      */
@@ -164,14 +179,15 @@
 
     /**
      * 鏍规嵁鍐滄埛濮撳悕鍜屾墜鏈哄彿鑾峰彇姘村崱鍒楄〃锛屽簲鐢ㄧ▼搴忎娇鐢�
+     * 
      * @param params
      * @return
      */
     List<VoCards2> getCardsByClientNameAndPhone(Map<?, ?> params);
 
-
     /**
      * 鏍规嵁鍐滄埛ID鏌ヨ姝ｅ父鐘舵�佺殑姘村崱鍒楄〃,灏忕▼搴忎娇鐢�
+     * 
      * @param clientId
      * @return
      */
@@ -179,13 +195,15 @@
 
     /**
      * 鏇存柊瀹炰綋鍗″墿浣欓噾棰�
+     * 
      * @param id
      * @param money
      */
-    void updateMoney(@Param("id")Long id , @Param("money")Double money);
+    void updateMoney(@Param("id") Long id, @Param("money") Double money);
 
     /**
-     *褰撳墠浣欓鎬婚噺锛堢墿鐞嗗崱锛�
+     * 褰撳墠浣欓鎬婚噺锛堢墿鐞嗗崱锛�
+     * 
      * @param
      * @return
      */
@@ -193,6 +211,7 @@
 
     /**
      * 鏍规嵁姘村崱鍦板潃鑾峰彇姘村崱鏁伴噺锛岀敤鏉ュ垽鏂鍗℃槸鍚﹀厑璁稿紑鍗★紝鏃犳晥鍗＄墖鎺掗櫎鍦ㄥ
+     * 
      * @param cardAddr
      * @return
      */
@@ -200,14 +219,15 @@
 
     /**
      * 鏍规嵁姘村崱鍦板潃鑾峰彇鎸囧畾鐘舵�佺殑姘村崱鏁伴噺锛岀敤鏉ュ垽鏂鍗℃槸鍚﹀厑璁稿紑鍗�
+     * 
      * @param cardAddr
      * @return
      */
     Long getCountByCardAddrAndState(String cardAddr);
 
-
     /**
      * 鑾峰彇鎸囧畾鏃堕棿娈垫按鍗′娇鐢ㄦ儏鍐佃褰曟暟閲�
+     * 
      * @param params
      * @return
      */
@@ -215,6 +235,7 @@
 
     /**
      * 鑾峰彇鎸囧畾鏃堕棿娈垫按鍗′娇鐢ㄦ儏鍐碉細鍏呭�煎悎璁°�佹秷璐瑰悎璁°�佷綑棰�
+     * 
      * @param params
      * @return
      */
@@ -222,40 +243,92 @@
 
     /**
      * 鑾峰彇鎸囧畾鏃堕棿娈靛唴姘村崱鍏呭�兼�昏
+     * 
      * @param timeStart
      * @param timeStop
      * @return
      */
-    Float getTotalRecharge(@Param("timeStart")String timeStart, @Param("timeStop")String timeStop);
+    Float getTotalRecharge(@Param("timeStart") String timeStart, @Param("timeStop") String timeStop);
 
     /**
      * 鑾峰彇鎸囧畾鏃堕棿娈靛唴姘村崱娑堣垂鎬昏
+     * 
      * @param timeStart
      * @param timeStop
      * @return
      */
-    Float getTotalConsumption(@Param("timeStart")String timeStart, @Param("timeStop")String timeStop);
+    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);
+    Integer turnCardValidByAddr(@Param("cardAddr") String cardAddr, @Param("operateType") Integer operateType);
 
     /**
      * 鍏呭�兼満鐢ㄦ牴鎹鍗曞彿灏嗘按鍗℃敼涓烘湁鏁�
+     * 
      * @param orderNumber
      * @return
      */
-    Integer turnCardValidByOrderNumber(@Param("orderNumber")String orderNumber);
+    Integer turnCardValidByOrderNumber(@Param("orderNumber") String orderNumber);
 
     /**
      * 鏍规嵁姘村崱ID鑾峰彇鍘熸按鍗D锛岃ˉ鍗￠�氱煡涓娇鐢�
+     * 
      * @param cardId
      * @return
      */
     Long getOriginalCardIdByCardId(@Param("cardId") Long cardId);
 
+    /**
+     * 鍏呭�兼満鐢ㄦ牴鎹ˉ鍗＄殑璁㈠崟鍙峰皢鎸傚け姘村崱浣欓缃浂
+     * 
+     * @param orderNumber
+     * @return
+     */
+    Integer emptyCardBalance(@Param("orderNumber") String orderNumber);
+
+    /**
+     * 鍏呭�兼満鐢ㄨ幏鍙栧啘鎴锋按鍗′俊鎭�
+     * 
+     * @param cardAddr
+     * @return
+     */
+    VoTermCard getTermCardInfo(@Param("cardAddr") String cardAddr);
+
+    /**
+     * 鑾峰彇宸叉寕澶辨按鍗″垪琛ㄨ褰曟暟閲�
+     * 
+     * @param params
+     * @return
+     */
+    Long getLostCardsCount(Map<?, ?> params);
+
+    /**
+     * 鑾峰彇宸叉寕澶辨按鍗″垪琛�
+     * 
+     * @param params
+     * @return
+     */
+    List<VoCards> getLostCards(Map<?, ?> params);
+
+    /**
+     * 鏍规嵁姘村崱缂栧彿鑾峰彇鍗′俊鎭�
+     * 
+     * @param cardNum
+     * @return
+     */
+    VoCardByClientNum getCardByCardNum(@Param("cardNum") String cardNum);
+
+    /**
+     * 妫�鏌ュ崱鍦板潃鏄惁宸插瓨鍦紙绠＄悊鍗¤〃 + 鍐滄埛姘村崱琛級
+     * 
+     * @param cardAddr 鍗″湴鍧�
+     * @return 瀛樺湪鐨勮褰曟暟閲�
+     */
+    Long checkCardAddrExists(@Param("cardAddr") String cardAddr);
 }
\ No newline at end of file

--
Gitblit v1.8.0