From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java
index ee07f46..8d19245 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java
@@ -1,9 +1,13 @@
package com.dsh.competition.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.competition.entity.Competition;
import com.dsh.competition.entity.PaymentCompetition;
+import com.dsh.competition.feignclient.model.BillingRequest;
import com.dsh.competition.model.CompetitionInfo;
import com.dsh.competition.model.CompetitionListVo;
+import com.dsh.competition.model.CompetitionQuery;
+import com.dsh.competition.model.TCompetition;
import com.dsh.competition.util.ResultUtil;
import java.util.List;
@@ -43,4 +47,10 @@
* @throws Exception
*/
ResultUtil cancelMyCompetition(Long id) throws Exception;
+
+ List<BillingRequest> queryDatas(Integer appUserId, String monthStart, String monthEnd);
+
+ List<BillingRequest> queryCancelDatas(Integer appUserId, String monthStart, String monthEnd);
+
+ List<PaymentCompetition> listAll(CompetitionQuery query);
}
--
Gitblit v1.7.1