From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java b/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
index 9fd00ff..b0faf43 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
@@ -27,9 +27,9 @@
public interface TCoursePackagePaymentMapper extends BaseMapper<TCoursePackagePayment> {
-
/**
* 获取课包购买人数
+ *
* @param coursePackageId
* @return
*/
@@ -37,22 +37,26 @@
TCoursePackagePayment getCoursePackagePaymentByCode(@Param("code") String code);
- List<BillingRequest> billingDataRequestVo(@Param("appUserId")Integer appUserId,
- @Param("monthStart")String monthStart,
- @Param("monthEnd")String monthEnd);
+ List<BillingRequest> billingDataRequestVo(@Param("appUserId") Integer appUserId,
+ @Param("monthStart") String monthStart,
+ @Param("monthEnd") String monthEnd);
/**
* 获取课包报名信息
+ *
* @param page
* @return
*/
List<Map<String, Object>> queryRegistrationRecord(Page<Map<String, Object>> page, @Param("coursePackageId") Integer coursePackageId,
@Param("userIds") List<Integer> userIds, @Param("studentIds") List<Integer> studentIds);
+ List<Map<String, Object>> queryRegistrationRecord1(Page<Map<String, Object>> page, @Param("coursePackageId") Integer coursePackageId,
+ @Param("userIds") List<Integer> userIds, @Param("studentIds") List<Integer> studentIds);
/**
* 获取未预约排课学员列表
+ *
* @param page
* @param coursePackagePaymentId
* @param userIds
@@ -62,19 +66,24 @@
List<Map<String, Object>> queryWalkInStudentList(Page<Map<String, Object>> page, @Param("coursePackageId") Integer coursePackageId, @Param("coursePackagePaymentId") List<Long> coursePackagePaymentId,
@Param("userIds") List<Integer> userIds, @Param("studentIds") List<Integer> studentIds);
- void updateUseTime(@Param("id")Long id, @Param("date") Date date);
+ void updateUseTime(@Param("id") Long id, @Param("date") Date date);
- List<Integer> getStudentIds(@Param("id")Long payId,@Param("classId")Integer classId,@Param("appId")Integer appId);
+ List<Integer> getStudentIds(@Param("id") Long payId, @Param("classId") Integer classId, @Param("appId") Integer appId);
boolean updateHoursById(@Param("id") Long id, @Param("i") int i);
+ boolean updateHoursById1(@Param("id") Long id, @Param("i") int i);
+
void updateBytime(@Param("coursePackagePayment") TCoursePackagePayment coursePackagePayment);
- List<Map<String, Object>> getStudentTotal(StudentQeryDto studentQeryDto);
+ List<Map<String, Object>> getStudentTotal(@Param("appUserIds") List<Integer> appUserIds, @Param("start") String start,
+ @Param("end") String end);
List<Map<String, Object>> pacQueryDto(PacQueryDto pacQueryDto);
List<TCoursePackagePayment> listOne(@Param("ids") List<Integer> ids);
Integer queryStore(String code);
+
+ List<Map<String, Object>> queryRegistrationRecord3(Integer coursePackageId, List<Integer> userIds, List<Integer> studentIds);
}
--
Gitblit v1.7.1