java/PlayPai.git

			@@ -9,6 +9,7 @@
			import com.alipay.api.response.AlipayTradeQueryResponse;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.dsh.course.entity.*;
			@@ -34,12 +35,12 @@
			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.service.CoursePackageSchedulingService;
			import com.dsh.course.service.ICoursePackageSchedulingService;
			import com.dsh.course.service.TCoursePackagePaymentService;
			import com.dsh.course.util.*;
			import com.fasterxml.jackson.core.JsonProcessingException;
			import com.fasterxml.jackson.databind.ObjectMapper;
			import io.swagger.models.auth.In;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.http.HttpHeaders;
			import org.springframework.http.MediaType;
			@@ -50,6 +51,7 @@
			import org.springframework.web.client.RestTemplate;

			import javax.annotation.Resource;
			import javax.persistence.criteria.CriteriaBuilder;
			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.text.ParseException;
			@@ -730,8 +732,11 @@
			}



			@Override
			public List<RecordAppoint> obtainStuClassDetails(Integer stuId, Integer appUserId) {
			public List<RecordAppoint> obtainStuClassDetails(Integer stuId, Integer appUserId,Integer pageNum) {


			List<RecordAppoint> recordVoList = new ArrayList<>();
			List<TCoursePackagePayment> tCoursePackagePayments = this.baseMapper.selectList(new QueryWrapper<TCoursePackagePayment>()
			.eq("studentId",stuId )
			@@ -739,36 +744,80 @@
			.eq("payStatus",2 )
			.eq("status",1 )
			.orderByDesc("insertTime"));

			List<Integer> ids = new ArrayList<>();
			for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {
			ids.add(tCoursePackagePayment.getCoursePackageId());
			}
			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd");
			SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
			if (tCoursePackagePayments.size() > 0 ){
			for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {

			List<CoursePackageStudent> coursePackageStudent1 = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>()
			.eq("coursePackageId",tCoursePackagePayment.getCoursePackageId() )
			.eq("studentId",stuId)
			.eq("appUserId",appUserId)
			.eq("reservationStatus",1));
			if (ToolUtil.isNotEmpty(coursePackageStudent1) && coursePackageStudent1.size() > 0){
			// int pageNum = 1; // 页码
			int pageSize = 5; // 每页记录数
			Page<CoursePackageStudent> page = new Page<>(1, pageSize);

			// for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {
			// List<CoursePackageStudent> coursePackageStudent1 = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>()
			// .in("coursePackageId",ids)
			// .eq("studentId",stuId)
			// .eq("appUserId",appUserId)
			// .eq("reservationStatus",1));
			IPage<CoursePackageStudent> coursePackageStudentPage = cpsMapper.selectPage(page, new QueryWrapper<CoursePackageStudent>()
			.in("coursePackageId", ids)
			.eq("studentId", stuId)
			.eq("appUserId", appUserId)
			.eq("reservationStatus", 1));
			List<CoursePackageStudent> coursePackageStudent1 = coursePackageStudentPage.getRecords();


			if (ToolUtil.isNotEmpty(coursePackageStudent1) && coursePackageStudent1.size() > 0){
			TCoursePackage coursePackage = new TCoursePackage();
			Integer coursePackageId = -1;
			for (CoursePackageStudent coursePackageStudent : coursePackageStudent1) {
			RecordAppoint recordVo = new RecordAppoint();
			recordVo.setCoursePackageId(tCoursePackagePayment.getCoursePackageId());
			recordVo.setCoursePackageId(coursePackageStudent.getCoursePackageId());

			TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
			if (!coursePackageStudent.getCoursePackageId().equals(coursePackageId)) {
			coursePackage = tcpmapper.selectById(coursePackageStudent.getCoursePackageId());
			coursePackageId = coursePackageStudent.getCoursePackageId();
			}


			recordVo.setSid(Arrays.asList(coursePackage.getStoreId()));
			List<Integer> rid = stoClient.querySiteId(coursePackage.getStoreId());
			recordVo.setRid(rid);
			recordVo.setUserId(appUserId);
			recordVo.setSiteId(coursePackage.getSiteId());
			List<Integer> ids = getIds(coursePackage.getSiteId());
			recordVo.setIds(ids);
			List<Integer> ids1 = getIds(coursePackage.getSiteId());
			recordVo.setIds(ids1);

			recordVo.setCoursePackageName(coursePackage.getName());
			recordVo.setCourseHours(tCoursePackagePayment.getClassHours());
			for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {
			if (Objects.equals(coursePackageStudent.getCoursePackageId(), tCoursePackagePayment.getCoursePackageId())){
			recordVo.setCourseHours(tCoursePackagePayment.getClassHours());

			}
			}

			// recordVo.setCourseHours(tCoursePackagePayment.getClassHours());
			Date date = DateUtil.getDate();

			String classStartTime = coursePackage.getClassStartTime();
			String classEndTime = coursePackage.getClassEndTime();
			recordVo.setTimeFrame(simpleDateFormat.format(date)+" "+classStartTime+"-"+classEndTime);

			CoursePackageScheduling byId = coursePackageSchedulingService.getById(coursePackageStudent.getCoursePackageSchedulingId());
			// String classStartTime = coursePackage.getClassStartTime();
			// String classEndTime = coursePackage.getClassEndTime();

			if (byId == null){
			continue;
			}
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			String dateString1 = sdf.format(byId.getClassDate());
			String dateString2 = sdf.format(byId.getEndDate());


			recordVo.setTimeFrame(dateString1 + "-" + dateString2.substring(11));

			// recordVo.setTimeFrame(simpleDateFormat.format(date)+" "+classStartTime+"-"+classEndTime);
			Store store = stoClient.queryStoreById(coursePackage.getStoreId());
			recordVo.setStoreNameAddr(store.getName()+store.getAddress());
			recordVo.setCourseStuRecordId(coursePackageStudent.getId());
			@@ -777,7 +826,7 @@
			List<String> integerList = Arrays.asList(split);
			String weekOfDate = DateTimeHelper.getWeekOfDate(new Date());
			if (integerList.contains(weekOfDate)){
			String dat = simpleDateFormat.format(date) +" "+ classStartTime;
			String dat = simpleDateFormat.format(date) +" "+ dateString2.substring(11);

			Date start = null;
			try {
			@@ -791,7 +840,7 @@
			recordVo.setStatus(5);
			}else {
			CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
			.eq("coursePackageId",tCoursePackagePayment.getCoursePackageId() ));
			.eq("coursePackageId",coursePackageStudent.getCoursePackageId() ));
			if (ToolUtil.isNotEmpty(cancelledClasses)){
			recordVo.setStatus(3);
			// 消课到课状态0 旷课
			@@ -814,7 +863,8 @@
			}

			}
			}
			// }

			return recordVoList;
			}
			public List<Integer> getIds(Integer siteId) {