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/service/impl/PaymentCompetitionServiceImpl.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
index 7a8211f..fbde07c 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
@@ -12,6 +12,7 @@
 import com.dsh.competition.feignclient.account.model.Student;
 import com.dsh.competition.feignclient.course.CoursePackagePaymentClient;
 import com.dsh.competition.feignclient.course.model.PaymentDeductionClassHour;
+import com.dsh.competition.feignclient.model.BillingRequest;
 import com.dsh.competition.feignclient.other.StoreClient;
 import com.dsh.competition.feignclient.other.model.Store;
 import com.dsh.competition.mapper.PaymentCompetitionMapper;
@@ -232,4 +233,14 @@
         }
         return ResultUtil.success();
     }
+
+    @Override
+    public List<BillingRequest> queryDatas(Integer appUserId, String monthStart, String monthEnd) {
+        return this.baseMapper.queryDatas(appUserId,monthStart,monthEnd);
+    }
+
+    @Override
+    public List<BillingRequest> queryCancelDatas(Integer appUserId, String monthStart, String monthEnd) {
+        return this.baseMapper.queryCancelDatas(appUserId,monthStart,monthEnd);
+    }
 }

--
Gitblit v1.7.1