From e18c4a8ac170fea6e079047a27f72032c80eee67 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 30 九月 2024 14:12:18 +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 | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 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 8596575..c87cb33 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
@@ -3,11 +3,10 @@
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.voSt.VoICCard;
+import com.dy.pipIrrGlobal.voSt.VoCardUsage;
import com.dy.pipIrrGlobal.voWe.VoCards3;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -81,7 +80,7 @@
List<VoCardInfo1> getCardsByAddrAndNum(@Param("cardAddr") String cardAddr, @Param("cardNum") Long cardNum);
/**
- * 鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃
+ * 鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃锛堢墿鐞嗗崱+铏氭嫙鍗★級
* @param clientId
* @return
*/
@@ -185,10 +184,54 @@
void updateMoney(@Param("id")Long id , @Param("money")Double money);
/**
- * 鎸囧畾鏃堕棿娈靛唴寮�鍗℃�绘暟閲忥紙鐗╃悊鍗★級
+ *褰撳墠浣欓鎬婚噺锛堢墿鐞嗗崱锛�
+ * @param
+ * @return
+ */
+ Double getTotalMoneyIcCards();
+
+ /**
+ * 鏍规嵁姘村崱鍦板潃鑾峰彇姘村崱鏁伴噺锛岀敤鏉ュ垽鏂鍗℃槸鍚﹀厑璁稿紑鍗�
+ * @param cardAddr
+ * @return
+ */
+ Long getCountByCardAddr(String cardAddr);
+
+ /**
+ * 鏍规嵁姘村崱鍦板潃鑾峰彇鎸囧畾鐘舵�佺殑姘村崱鏁伴噺锛岀敤鏉ュ垽鏂鍗℃槸鍚﹀厑璁稿紑鍗�
+ * @param cardAddr
+ * @return
+ */
+ Long getCountByCardAddrAndState(String cardAddr);
+
+
+ /**
+ * 鑾峰彇鎸囧畾鏃堕棿娈垫按鍗′娇鐢ㄦ儏鍐佃褰曟暟閲�
* @param params
* @return
*/
- Long getOpenCountIcCardsCount(Map<String, Object> params);
+ List<VoCardUsage> getCardUsagesCount(Map<?, ?> params);
+ /**
+ * 鑾峰彇鎸囧畾鏃堕棿娈垫按鍗′娇鐢ㄦ儏鍐碉細鍏呭�煎悎璁°�佹秷璐瑰悎璁°�佷綑棰�
+ * @param params
+ * @return
+ */
+ List<VoCardUsage> getCardUsages(Map<?, ?> params);
+
+ /**
+ * 鑾峰彇鎸囧畾鏃堕棿娈靛唴姘村崱鍏呭�兼�昏
+ * @param timeStart
+ * @param timeStop
+ * @return
+ */
+ 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);
}
\ No newline at end of file
--
Gitblit v1.8.0