Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-14 26e2592813b9263124d518d238262910e817d323

 cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java

@@ -1,8 +1,11 @@
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;
@@ -15,6 +18,7 @@
import com.dsh.course.util.ResultUtil;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -91,4 +95,21 @@

    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);
}