From 63b6d78b7f906d7464eca710695bef600772651d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 05 九月 2023 12:01:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java
index 13ebdf2..cd0703d 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java
@@ -1,8 +1,12 @@
package com.dsh.course.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.course.entity.TCoursePackagePayment;
import com.dsh.course.feignclient.model.RecordAppoint;
+import com.dsh.course.model.QueryRegistrationRecord;
+import com.dsh.course.model.QueryWalkInStudentList;
+import com.dsh.course.model.BillingRequest;
import com.dsh.course.model.vo.RegisterCourseVo;
import com.dsh.course.model.vo.request.ClasspaymentRequest;
import com.dsh.course.model.vo.request.CourseOfAfterRequest;
@@ -14,6 +18,7 @@
import com.dsh.course.util.ResultUtil;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -88,4 +93,23 @@
ResultUtil insertVipPaymentCallback(String code, String orderNumber);
+ List<BillingRequest> queryAmountDatas(Integer appUserId, String monthStart, String monthEnd);
+
+
+ /**
+ * 获取课包报名信息
+ * @param page
+ * @param queryRegistrationRecord
+ * @return
+ */
+ List<Map<String, Object>> queryRegistrationRecord(Page<Map<String, Object>> page, QueryRegistrationRecord queryRegistrationRecord);
+
+
+ /**
+ * 获取未预约排课学员列表
+ * @param page
+ * @param queryWalkInStudentList
+ * @return
+ */
+ List<Map<String, Object>> queryWalkInStudentList(Page<Map<String, Object>> page, QueryWalkInStudentList queryWalkInStudentList);
}
--
Gitblit v1.7.1