From 5592de9cf80aa78486775a72a6224973c93146da Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 08 八月 2023 17:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java
index 35c7a0e..bbed075 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsh.competition.entity.PaymentCompetition;
+import com.dsh.competition.feignclient.model.BillingRequest;
 import com.dsh.competition.model.CompetitionListVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,4 +25,13 @@
      */
     List<CompetitionListVo> queryMyCompetitionList(@Param("uid") Integer uid, @Param("type") Integer type,
                                                    @Param("pageSize") Integer pageSize, @Param("pageNo") Integer pageNo);
+
+    List<BillingRequest> queryDatas(@Param("appUserId") Integer appUserId,
+                                    @Param("monthStart")String monthStart,
+                                    @Param("monthEnd")String monthEnd);
+
+    List<BillingRequest> queryCancelDatas(@Param("appUserId") Integer appUserId,
+                                          @Param("monthStart")String monthStart,
+                                          @Param("monthEnd")String monthEnd);
+
 }

--
Gitblit v1.7.1