From 471c449df219f2be0a67dadf9ea2946cc3edfce7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 12 十一月 2024 17:45: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/SeVirtualCardMapper.java |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java
index 5f456fc..0d90840 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java
@@ -2,11 +2,13 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
+import com.dy.pipIrrGlobal.voSe.VoCardInfo1;
 import com.dy.pipIrrGlobal.voSe.VoVcRecharge;
 import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -43,7 +45,7 @@
      * 鑾峰彇鍐滄埛鍏ㄩ儴铏氭嫙鍗�
      * @return
      */
-    List<VoVirtualCard> getVCs(@Param("clientId") Long clientId);
+    List<VoVirtualCard> getVCs(@Param("alarmValue") Integer alarmValue, @Param("clientId") Long clientId);
 
     /**
      * 鏍规嵁铏氭嫙鍗D鑾峰彇铏氭嫙鍗″璞�
@@ -66,6 +68,12 @@
      */
     Map getClientIdAndNameByVsCardNo(@Param("vcNum") Long vcNum);
 
+    /**
+     * 寰楀埌姘村崱瀵硅薄
+     * @param cardNum
+     * @return
+     */
+    List<VoCardInfo1> getCardsByNum(@Param("cardNum") Long cardNum);
 
     /**
      * 鏍规嵁铏氭嫙鍗$紪鍙疯幏鍙栬櫄鎷熷崱ID
@@ -86,7 +94,7 @@
      * @param intakeId
      * @return
      */
-    void updateVcCardNoUseStateByIntakeId(@Param("intakeId")Long intakeId) ;
+    void updateVcCardNoUseStateByIntakeId(@Param("intakeId")Long intakeId, @Param("now")Date now) ;
 
     /**
      * 鑾峰彇铏氭嫙鍗″厖鍊艰褰�
@@ -100,4 +108,26 @@
      * @return
      */
     Long getRechargeRecordCount(Map<?, ?> params);
+
+    /**
+     * 鏇存柊瀹炰綋鍗″墿浣欓噾棰�
+     * @param id
+     * @param money
+     */
+    void updateMoney(@Param("id")Long id , @Param("money")Double money);
+
+    /**
+     * 鏍规嵁鍐滄埛ID鍙婅櫄鎷熷崱ID鑾峰彇姝e父鐘舵�佺殑铏氭嫙鍗″璞★紝閿�鍗′娇鐢�
+     * @param clientId
+     * @param vcId
+     * @return
+     */
+    SeVirtualCard getVcByClientIdAndVcId(@Param("clientId")Long clientId, @Param("vcId")Long vcId);
+
+    /**
+     * 娉ㄩ攢铏氭嫙鍗�
+     * @param vcId
+     * @return
+     */
+    Integer cancelVc(@Param("clientId")Long clientId, @Param("vcId")Long vcId);
 }
\ No newline at end of file

--
Gitblit v1.8.0