From d919e26796ec5a6f78fc0b665840207f185f1274 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 22 二月 2024 15:25:20 +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 | 87 ++++++++++++++++++++++--------------------- 1 files changed, 44 insertions(+), 43 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 1acd2b6..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,20 +4,19 @@ 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; /** * @author ZhuBaoMin - * @date 2024-01-18 19:28 - * @LastEditTime 2024-01-18 19:28 + * @date 2024-02-02 16:00 + * @LastEditTime 2024-02-02 16:00 * @Description */ @Mapper -public interface SeCardOperateMapper extends BaseMapper { +public interface SeCardOperateMapper extends BaseMapper<SeCardOperate> { int deleteByPrimaryKey(Long id); int insert(SeCardOperate record); @@ -57,44 +56,8 @@ * @param params * @return */ - List<VoTransaction> getTransactions(Map<?, ?> params); - - /** - * 鏍规嵁鎸囧畾鏉′欢鑾峰彇璐按姹囨�诲拰璐崱姹囨�伙紝鑾峰彇浜ゆ槗鏄庣粏浣跨敤 - * @param params - * @return - */ - Map getTransactionSums(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); + /*List<VoTransaction> getTransactions(Map<?, ?> params);*/ + List<VoTradeDetails> getTransactions(Map<?, ?> params); /** * 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰曟暟 @@ -108,7 +71,7 @@ * @param params * @return */ - List<VoActiveCardNew> getActiveCards(Map<?, ?> params); + List<VoActiveCard> getActiveCards(Map<?, ?> params); /** @@ -124,4 +87,42 @@ * @return */ 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 + */ + Long getReceiptsRecordCount(Map<?, ?> params); + + /*** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏀舵嵁鍒楄〃 + * @param params + * @return + */ + List<VoReceipt> getReceipts(Map<?, ?> params); + + /** + * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏀舵嵁鏀惰垂閲戦鍚堣 + * @param params + * @return + */ + Double getTotalAmount(Map<?, ?> params); } \ No newline at end of file -- Gitblit v1.8.0