From d5fb7403743cd1b42c805853da68a8366e4b50d2 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 17 六月 2024 19:25:50 +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/SeCardOperateMapper.java | 50 ++++++++++++++++++-------------------------------- 1 files changed, 18 insertions(+), 32 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 214c071..00cb1f0 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 @@ -4,7 +4,6 @@ import com.dy.pipIrrGlobal.pojoSe.SeCardOperate; import com.dy.pipIrrGlobal.voSe.*; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -61,36 +60,6 @@ List<VoTradeDetails> getTransactions(Map<?, ?> params); /** - * 鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗缁熻璁板綍鏁� - * @param params - * @return - */ - Long getTransactionStatisticsRecordCount(Map<?, ?> params); - - /** - * 鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗缁熻璁板綍 - * @param params - * @return - */ - List<VoTransactionStatistics> getTransactionStatistics(Map<?, ?> params); - - /** - * 鏍瑰熀鎸囧畾鏉′欢鑾峰彇绗旀暟鍚堣銆佸疄鏀堕噾棰濆悎璁°�佽禒閫侀噾棰濆悎璁� - * @param params - * @return - */ - Map getTransactionStatisticsSums(Map<?, ?> params); - - /** - * 鑾峰彇鎸囧畾鏃ユ湡銆佹寚瀹氭敮浠樻柟寮忓疄鏀堕噾棰濆悎璁� - * @param tradeDate - * @param paymentId - * @return - */ - //Float getPaymentSums(Map<?, ?> params); - Float getPaymentSums(@Param("tradeDate") String tradeDate, @Param("paymentId") Long paymentId); - - /** * 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰曟暟 * @param params * @return @@ -102,7 +71,7 @@ * @param params * @return */ - List<VoActiveCardNew> getActiveCards(Map<?, ?> params); + List<VoActiveCard> getActiveCards(Map<?, ?> params); /** @@ -120,6 +89,23 @@ List<VoReissueCard> getReissueCards(Map<?, ?> params); /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇閫氱敤鎿嶄綔璁板綍鏁伴噺 + * 娉ㄩ攢銆佹寕澶便�佸啿姝c�佽В閿侀�氱敤 + * @param params + * @return + */ + Long getCommonOperationRecordCount(Map<?, ?> params); + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇閫氱敤鎿嶄綔璁板綍 + * 娉ㄩ攢銆佹寕澶便�佸啿姝c�佽В閿侀�氱敤 + * @param params + * @return + */ + List<VoOperate> getCommonOperations(Map<?, ?> params); + + + /** * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏀舵嵁鍒楄〃鏁� * @param params * @return -- Gitblit v1.8.0