From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 de5d28d..1428de3 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
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsh.course.entity.PacQueryDto;
import com.dsh.course.entity.TCoursePackagePayment;
+import com.dsh.course.entity.dto.StudentQeryDto;
import com.dsh.course.model.QueryRegistrationRecord;
import com.dsh.course.model.BillingRequest;
import io.swagger.models.auth.In;
@@ -25,9 +27,9 @@
public interface TCoursePackagePaymentMapper extends BaseMapper<TCoursePackagePayment> {
-
/**
* 获取课包购买人数
+ *
* @param coursePackageId
* @return
*/
@@ -35,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
@@ -60,9 +66,21 @@
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>> pacQueryDto(PacQueryDto pacQueryDto);
+
+ List<TCoursePackagePayment> listOne(@Param("ids") List<Integer> ids);
+
+ Integer queryStore(String code);
}
--
Gitblit v1.7.1