From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java | 124 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 118 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java
index c12558c..ab50970 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeCardOperateMapper.java
@@ -1,24 +1,24 @@
package com.dy.pipIrrGlobal.daoSe;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSe.SeCardOperate;
import com.dy.pipIrrGlobal.voSe.*;
-import com.dy.pipIrrGlobal.voSt.VoClient;
import com.dy.pipIrrGlobal.voSt.VoClientOpenCardCount;
+import com.dy.pipIrrGlobal.voSt.VoClientRechargeTotal;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @author ZhuBaoMin
- * @date 2024-02-02 16:00
- * @LastEditTime 2024-02-02 16:00
+ * @date 2025-05-08 17:15
+ * @LastEditTime 2025-05-08 17:15
* @Description
*/
-
@Mapper
-public interface SeCardOperateMapper extends BaseMapper<SeCardOperate> {
+public interface SeCardOperateMapper {
int deleteByPrimaryKey(Long id);
int insert(SeCardOperate record);
@@ -45,6 +45,32 @@
*/
List<VoRecharge> getRecharges(Map<?, ?> params);
+ /**
+ * 鑾峰彇鍏呭�艰褰曟暟閲忥紝绠＄悊骞冲彴鍏呭�煎垪琛ㄤ娇鐢紝APP鏈娇鐢�
+ * @param params
+ * @return
+ */
+ Long getRechargesCountNew(Map<?, ?> params);
+
+ /**
+ * 鑾峰彇鍏呭�艰褰曪紝绠＄悊骞冲彴鍏呭�煎垪琛ㄤ娇鐢紝APP鏈娇鐢�
+ * @param params
+ * @return
+ */
+ List<VoRechargeNew> getRechargesNew(Map<?, ?> params);
+
+ /**
+ * 鑾峰彇杩旇繕璁板綍鏁伴噺锛岀鐞嗗钩鍙板厖鍊煎垪琛ㄤ娇鐢�
+ * @param params
+ * @return
+ */
+ Long getRefundsCount(Map<?, ?> params);
+ /**
+ * 鑾峰彇杩旇繕璁板綍锛岀鐞嗗钩鍙板厖鍊煎垪琛ㄤ娇鐢�
+ * @param params
+ * @return
+ */
+ List<VoRefund> getRefunds(Map<?, ?> params);
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗璁板綍鏁�
@@ -170,4 +196,90 @@
* @return
*/
List<VoClientOpenCardCount> getOpenIcCardClients(Map<String, Object> params);
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴姣忎釜鍐滄埛鍏呭�煎悎璁� 鍐滄埛鏁伴噺
+ * @param params
+ * @return
+ */
+ Long getRechargeTotalClientsCount(Map<String, Object> params);
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴姣忎釜鍐滄埛鍏呭�煎悎璁�
+ * @param params
+ * @return
+ */
+ List<VoClientRechargeTotal> getRechargeTotalClients(Map<String, Object> params);
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴鐗╃悊鍗″厖鍊奸噾棰濊秴杩囨寚瀹氬�肩殑鍐滄埛鏁伴噺
+ * @param params
+ * @return
+ */
+ Long getRechargeTotalGtValueClientsCount(Map<String, Object> params);
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴鐗╃悊鍗″厖鍊奸噾棰濊秴杩囨寚瀹氬�肩殑鍐滄埛
+ * @param params
+ * @return
+ */
+ List<VoClientRechargeTotal> getRechargeTotalGtValueClients(Map<String, Object> params);
+
+ /**
+ * 渚濇嵁姘村崱ID灏嗘渶鍚庝竴鏉℃棤鏁堢姸鎬佺殑鎸囧畾鎿嶄綔璁板綍鏀逛负鏈夋晥
+ * @param cardId
+ * @return
+ */
+ Integer turnOperateValidByCardId(@Param("cardId") Long cardId, @Param("operateType") Integer operateType);
+
+ /**
+ * 鍏呭�兼満鐢ㄦ牴鎹鍗曞彿灏嗘搷浣滆褰曟敼涓烘湁鏁�
+ * @param orderNumber
+ * @return
+ */
+ Integer turnOperateValidByOrderNumber(String orderNumber);
+
+ /**
+ * 鍏呭�兼満鐢ㄨ幏鍙栧厖鍊兼搷浣滃悗鏂扮殑浣欓鍙婂厖鍊兼椂闂�
+ * @param orderNumber
+ * @return
+ */
+ //Float getBalanceAfterRecharge(String orderNumber);
+ VoAfterRecharge getBalanceAfterRecharge(String orderNumber);
+
+ /**
+ * 鍏呭�兼満鐢ㄦ牴鎹按鍗D鑾峰彇鍚屾鍏呭�艰褰曟暟閲�
+ * @param cardId
+ * @return
+ */
+ Integer getPlusRechargeCount(Long cardId);
+
+
+ /**
+ * 鏍规嵁姘村崱ID銆佹搷浣滅被鍨嬭幏鍙栬幏鍙栨渶鍚庝竴鏉¤褰曪紝鍒ゆ柇寮�鍗℃槸鍚﹀悓姝ュ厖鍊间娇鐢�
+ * @param cardId
+ * @return
+ */
+ SeCardOperate getCardOperate(@Param("operateType") Integer operateType, @Param("cardId") Long cardId);
+
+ /**
+ * 鍏呭�兼満鐢ㄦ牴鎹鍗曞彿鑾峰彇闈炰氦鏄撻噾棰�
+ * @param orderNumber
+ * @return
+ */
+ Float getNoTradeAmount(String orderNumber);
+
+ /**
+ * 鍏呭�兼満鐢ㄦ牴鎹鍗曞彿鑾峰彇鎿嶄綔鏃堕棿
+ * @param orderNumber
+ * @return
+ */
+ Date getOperateTime(String orderNumber);
+
+ /**
+ * 鍏呭�兼満浣跨敤鏍规嵁璁㈠崟鍙疯幏鍙栨搷浣滆褰�
+ * @param orderNumber
+ * @return
+ */
+ VoRepaySupplementSimple getCardOperateByOrderNumber(String orderNumber);
}
\ No newline at end of file
--
Gitblit v1.8.0