From 2493985a5bdfc6496381b39de0f9713b79c2e51d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 11:14:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java | 23 +++++++++++++++++++----
1 files changed, 19 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 fbb40ef..040ea55 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
@@ -3,14 +3,18 @@
import com.baomidou.mybatisplus.extension.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.course.entity.PacQueryDto;
import com.dsh.course.entity.TCoursePackagePayment;
+import com.dsh.course.entity.dto.StudentQeryDto;
import com.dsh.course.feignclient.model.RecordAppoint;
import com.dsh.course.model.*;
import com.dsh.course.model.vo.RegisterCourseVo;
import com.dsh.course.model.vo.request.*;
import com.dsh.course.model.vo.response.*;
import com.dsh.course.util.ResultUtil;
+import io.swagger.models.auth.In;
+import java.text.ParseException;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -72,7 +76,7 @@
* @param appUserId
* @return
*/
- CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId);
+ CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId,String lon,String lat);
@@ -84,7 +88,7 @@
* @param appUserId
* @return
*/
- List<RecordAppoint> obtainStuClassDetails(Integer stuId, Integer appUserId);
+ List<RecordAppoint> obtainStuClassDetails(Integer stuId, Integer appUserId,Integer pageNum);
ResultUtil insertVipPaymentCallback(String code, String orderNumber);
@@ -114,12 +118,12 @@
PayCourseInfoReq payCourseInfo(Integer courseId);
- ResultUtil payCourse(PayCourseReq req, Integer userId);
+ ResultUtil payCourse(PayCourseReq req, Integer userId) throws ParseException;
void updateUseTime(Long id, Date date);
- List<Integer> getStudentIds(Integer payId);
+ List<Integer> getStudentIds(Long payId,Integer classId,Integer appId);
boolean updateHoursById(TCoursePackagePayment byId, int i);
@@ -127,4 +131,15 @@
List<CoursePackagePaymentVO> listAll(CoursePackagePaymentQuery query);
int changeState(CoursePackagePayDTO dto);
+
+ void updateBytime(TCoursePackagePayment coursePackagePayment);
+
+ List<RegisterOrderVO> listAllRegister(RegisterOrderQuery query);
+
+ List<Map<String, Object>> getStudentTotal(StudentQeryDto studentQeryDto);
+
+ List<Map<String, Object>> bypac(PacQueryDto pacQueryDto);
+ List<TCoursePackagePayment> listOne(List<Integer> ids);
+
+ Integer listStoreId(String code);
}
--
Gitblit v1.7.1