java/PlayPai.git

			@@ -180,6 +180,7 @@
			coursePackageOrder.setStudentIds(String.valueOf(packagePayment.getStudentId()));
			coursePackageOrder.setCoursePackageId(packagePayment.getCoursePackageId());
			coursePackageOrder.setClassHours(packagePayment.getClassHours());
			coursePackageOrder.setLaveClassHours(packagePayment.getClassHours());
			coursePackageOrder.setOriginalPrice(packagePayment.getOriginalPrice());
			coursePackageOrder.setCashPayment(packagePayment.getCashPayment());
			coursePackageOrder.setPlayPaiCoin(packagePayment.getPlayPaiCoin());
			@@ -246,7 +247,7 @@
			coursePackageOrderStudentService.saveOrUpdate(coursePackageOrderStudent);
			Integer studentId = Integer.valueOf(byId1.getStudentIds());
			//开始排课
			addPackageStudent1(byId, byId1.getAppUserId(), studentId, coursePackageOrderStudent);
			addPackageStudent1(byId, byId1.getAppUserId(), studentId, byId1, coursePackageOrderStudent);
			} else {
			Date useTime = coursePackageOrderStudent.getUseTime();
			coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + byId1.getClassHours());
			@@ -280,12 +281,12 @@
			Integer studentId = Integer.valueOf(byId1.getStudentIds());
			//中间断课，没有连续续费的情况需要重新排课
			if (useTime.compareTo(new Date()) < 0) {
			addPackageStudent1(byId, byId1.getAppUserId(), studentId, coursePackageOrderStudent);
			addPackageStudent1(byId, byId1.getAppUserId(), studentId, byId1, coursePackageOrderStudent);
			}
			}
			}
			if(byId.getType() == 2){
			addPackageStudent1(byId, byId1.getAppUserId(), Integer.valueOf(byId1.getStudentIds()), null);
			addPackageStudent1(byId, byId1.getAppUserId(), Integer.valueOf(byId1.getStudentIds()), byId1, null);
			}
			return packagePaymentService.changeState(dto);
			}
			@@ -1729,7 +1730,7 @@
			if (student != null) {
			sId = student.getId();
			}
			addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePayment.getId());
			addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePayment, coursePackagePayment.getId());


			CourseCounsum courseCounsum = new CourseCounsum();
			@@ -1752,7 +1753,7 @@
			if (student != null) {
			sId = student.getId();
			}
			addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePaymentServiceOne.getId());
			addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePaymentServiceOne, coursePackagePaymentServiceOne.getId());


			CourseCounsum courseCounsum = new CourseCounsum();
			@@ -1903,7 +1904,8 @@

			@Autowired
			private TCoursePackageService coursePackageService;
			private void addPackageStudent1(TCoursePackage tCoursePackage, Integer userId, Integer sId, CoursePackageOrderStudent coursePackageOrderStudent) {

			private void addPackageStudent1(TCoursePackage tCoursePackage, Integer userId, Integer sId, CoursePackageOrder coursePackageOrder, CoursePackageOrderStudent coursePackageOrderStudent) {
			try {
			//1常规 2假期 3体验
			if (tCoursePackage.getType() == 1) {
			@@ -1960,6 +1962,7 @@
			coursePackageScheduling.setAppUserId(userId);
			coursePackageScheduling.setStudentId(sId);
			coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
			coursePackageScheduling.setCoursePackagePaymentIds(coursePackageOrder.getId().toString());
			Date parse = format1.parse(format.format(time) + " " + split[j]);
			Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
			coursePackageScheduling.setClassDate(parse);
			@@ -2020,6 +2023,7 @@
			coursePackageScheduling.setAppUserId(userId);
			coursePackageScheduling.setStudentId(sId);
			coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
			coursePackageScheduling.setCoursePackagePaymentIds(coursePackageOrder.getId().toString());
			Date parse = format1.parse(format.format(time) + " " + split[j]);
			Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
			coursePackageScheduling.setClassDate(parse);
			@@ -2045,7 +2049,7 @@
			e.printStackTrace();
			}
			}
			private void addPackageStudent(Integer courseId, Integer userId, Integer sId, Long paymentId) throws ParseException {
			private void addPackageStudent(Integer courseId, Integer userId, Integer sId, TCoursePackagePayment coursePackagePayment, Long paymentId) throws ParseException {
			// 课包
			TCoursePackage tCoursePackage = coursePackageService.getById(courseId);

			@@ -2096,6 +2100,7 @@
			}
			CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
			coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
			coursePackageScheduling.setCoursePackagePaymentIds(coursePackagePayment.getId().toString());
			Date parse = format1.parse(format.format(date) + " " + split[i1]);
			Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
			coursePackageScheduling.setClassDate(parse);
			@@ -2159,6 +2164,7 @@
			}
			CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
			coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
			coursePackageScheduling.setCoursePackagePaymentIds(coursePackagePayment.getId().toString());
			Date parse = format1.parse(format.format(date) + " " + split[i1]);
			Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
			coursePackageScheduling.setClassDate(parse);
			@@ -2271,6 +2277,7 @@
			}
			CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
			coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
			coursePackageScheduling.setCoursePackagePaymentIds(pay.getId().toString());
			Date parse = format1.parse(format.format(date) + " " + split[i1]);
			Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
			coursePackageScheduling.setClassDate(parse);