java/PlayPai.git

			@@ -28,6 +28,7 @@
			import com.dsh.course.util.*;
			import com.fasterxml.jackson.core.JsonProcessingException;
			import com.fasterxml.jackson.databind.ObjectMapper;
			import com.obs.services.internal.ServiceException;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiImplicitParam;
			import io.swagger.annotations.ApiImplicitParams;
			@@ -333,7 +334,7 @@
			Store store = storeClient.queryStoreById(re.getStoreId());
			TAppUser appUser = appUserClient.queryAppUser1(re.getAppUserId());
			String studentId = re.getStudentId();
			String[] split = studentId.split(",");
			String[] split = studentId.split(";");
			StringBuilder stringBuilder = new StringBuilder("");

			for (String s : split) {
			@@ -2367,13 +2368,13 @@

			@ResponseBody
			@PostMapping("/coursePackagePayment/consumeCourse")
			public ResultUtil consumeCourse(@RequestBody Integer coursePackagePaymentId) {
			public Integer consumeCourse(@RequestBody Integer coursePackagePaymentId) {
			CoursePackageOrderStudent coursePackageOrderStudent = orderStudentService.getById(coursePackagePaymentId);

			TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrderStudent.getCoursePackageId());

			if (coursePackageOrderStudent.getLaveClassHours()<coursePackage.getNeedNum()){
			return ResultUtil.error("当前学员课时数不足");
			return 1;
			}
			coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours()-coursePackage.getNeedNum());
			orderStudentService.updateById(coursePackageOrderStudent);
			@@ -2384,14 +2385,14 @@
			courseCounsum.setInsertTime(new Date());
			courseCounsum.setReason("补课");
			courseCounsumService.save(courseCounsum);
			return ResultUtil.success("补课成功");
			return 2;
			}


			@ResponseBody
			@PostMapping("/coursePackagePayment/CountqueryByClassId")
			public Integer CountqueryByClassId(@RequestBody Integer id) {
			int coursePackageId = packagePaymentService.count(new QueryWrapper<TCoursePackagePayment>().eq("coursePackageId", id));
			int coursePackageId = coursePackageOrderStudentService.count(new QueryWrapper<CoursePackageOrderStudent>().eq("coursePackageId", id));


			return coursePackageId;
			@@ -2640,6 +2641,11 @@
			detailsListVo.setIsType(list4.get(0).getType());

			for (CoursePackageStudent coursePackageStudent : list4) {
			CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingMapper.selectById(coursePackageStudent.getCoursePackageSchedulingId());
			if (coursePackageScheduling.getStatus()==4){
			detailsListVo.setIsType(3);
			}

			Integer signInOrNot1 = coursePackageStudent.getSignInOrNot();
			detailsListVo.setType(1);

			@@ -2647,7 +2653,6 @@
			detailsListVo.setType(3);
			}
			detailsListVo.setIsType(coursePackageStudent.getType());
			CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingMapper.selectById(coursePackageStudent.getCoursePackageSchedulingId());
			Date classDate = coursePackageScheduling.getClassDate();
			Date endDate = coursePackageScheduling.getEndDate();
			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");