From b38caa7012b8da89d5ca61d389258d4fd8d9172e Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 09 八月 2023 17:51:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 4820e2b..f08e76e 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
@@ -2,6 +2,8 @@
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.BillingRequest;
import com.dsh.course.model.vo.RegisterCourseVo;
import com.dsh.course.model.vo.request.ClasspaymentRequest;
import com.dsh.course.model.vo.request.CourseOfAfterRequest;
@@ -12,7 +14,6 @@
import com.dsh.course.model.vo.response.CourseOfVideoResponse;
import com.dsh.course.util.ResultUtil;
-import java.util.Date;
import java.util.List;
/**
@@ -25,7 +26,6 @@
*/
public interface TCoursePackagePaymentService extends IService<TCoursePackagePayment> {
- List<TCoursePackagePayment> queryAllCoursePackage(Date startTime, Date endTime , Integer lessionId, Integer stuId, Integer appUserId);
/**
@@ -69,14 +69,26 @@
/**
* 获取已报名课包详情
- * @param coursePackageId
+ * @param coursePayId
* @param appUserId
* @return
*/
- CourseDetailsResponse queryRegisteredCourseDetails(Integer coursePackageId, Integer appUserId);
+ CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId);
ResultUtil ContinuationOrpaymentCourse(Integer userIdFormRedis, ClasspaymentRequest request);
+ /**
+ * 查询学员的课包上课记录
+ * @param stuId
+ * @param appUserId
+ * @return
+ */
+ List<RecordAppoint> obtainStuClassDetails(Integer stuId, Integer appUserId);
+
+ ResultUtil insertVipPaymentCallback(String code, String orderNumber);
+
+ List<BillingRequest> queryAmountDatas(Integer appUserId, String monthStart, String monthEnd);
+
}
--
Gitblit v1.7.1