From 46ea49c9452002f2c01a10fd9550339a8aaa7cd1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 18 六月 2025 14:19:15 +0800
Subject: [PATCH] 1、新了解到，FBox可接多台套水肥机、气象站、墒情站，相应修改协议（主要是主题部分）； 2、编写《水肥机、气象站、墒情站协议》（未完）。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 8 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 1fbee9f..0773dfd 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;
@@ -16,8 +13,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 +34,7 @@
/**
* 渚濇嵁姘村崱鍦板潃鑾峰彇姘村崱缂栧彿锛�12鏈�19鏃ュ簾寮冿級
+ * 2024-06-30鍙栨秷搴熷純锛屾仮澶嶄娇鐢�
* @param cardAddr
* @return
*/
@@ -141,7 +139,7 @@
List<VoCards> getUnreplaced(Map<?, ?> params);
/**
- * 鏍规嵁鎸囧畾姘村崱缂栧彿鑾峰彇鎸傚け浜嬭褰曟暟閲忥紙琛ュ崱銆佽В閿佷娇鐢級
+ * 鏍规嵁鎸囧畾姘村崱缂栧彿鑾峰彇鎸傚け璁板綍鏁伴噺锛堣ˉ鍗°�佽В閿佷娇鐢級
* @param cardNum
* @return
*/
@@ -191,7 +189,7 @@
Double getTotalMoneyIcCards();
/**
- * 鏍规嵁姘村崱鍦板潃鑾峰彇姘村崱鏁伴噺锛岀敤鏉ュ垽鏂鍗℃槸鍚﹀厑璁稿紑鍗�
+ * 鏍规嵁姘村崱鍦板潃鑾峰彇姘村崱鏁伴噺锛岀敤鏉ュ垽鏂鍗℃槸鍚﹀厑璁稿紑鍗★紝鏃犳晥鍗＄墖鎺掗櫎鍦ㄥ
* @param cardAddr
* @return
*/
@@ -218,4 +216,56 @@
* @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);
+
+ /**
+ * 渚濇嵁姘村崱鍦板潃灏嗘渶鍚庝竴鏉℃棤鏁堢姸鎬佺殑鎸囧畾鎿嶄綔璁板綍鏀逛负鏈夋晥
+ * @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);
+
+ /**
+ * 鍏呭�兼満鐢ㄦ牴鎹ˉ鍗＄殑璁㈠崟鍙峰皢鎸傚け姘村崱浣欓缃浂
+ * @param orderNumber
+ * @return
+ */
+ Integer emptyCardBalance(@Param("orderNumber")String orderNumber);
+
+ /**
+ * 鍏呭�兼満鐢ㄨ幏鍙栧啘鎴锋按鍗′俊鎭�
+ * @param cardAddr
+ * @return
+ */
+ VoTermCard getTermCardInfo(@Param("cardAddr")String cardAddr);
}
\ No newline at end of file
--
Gitblit v1.8.0