From 334fbd5f1a5a4e85c198560bd024211ba4cf99b1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 18:27:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java b/cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java
index 30237b2..ef52ffb 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/mapper/RechargeRecordsMapper.java
@@ -2,6 +2,14 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsh.account.entity.RechargeRecords;
+import com.dsh.account.entity.VipPayment;
+import com.dsh.account.model.IncomeQuery;
+import com.dsh.account.model.query.RechargeRecordsQuery;
+import com.dsh.account.model.vo.RechargeRecordsVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +21,8 @@
  */
 public interface RechargeRecordsMapper extends BaseMapper<RechargeRecords> {
 
+    List<RechargeRecordsVO> rechargeList(@Param("query") RechargeRecordsQuery query, @Param("sTime") String sTime, @Param("eTime") String eTime);
+
+    List<VipPayment> listAll(@Param("query") IncomeQuery query, @Param("sTime") String sTime, @Param("eTime") String eTime, @Param("amount") BigDecimal amount, @Param("insertType") Integer insertType);
+
 }

--
Gitblit v1.7.1