java/PlayPai.git

			@@ -19,6 +19,8 @@
			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletRequest;
			import java.math.BigDecimal;
			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			@@ -70,12 +72,12 @@
			* @return
			*/
			@Override
			public Page<Map<String, Object>> queryCoursePackageLists(String provinceCode, String cityCode, Integer coursePackageTypeId, Integer storeId, String name, Integer status, Integer state) {
			public Page<Map<String, Object>> queryCoursePackageLists(String provinceCode, String cityCode, Integer coursePackageTypeId, List<Integer> storeId, String name, Integer status, Integer state) {
			QueryCoursePackageLists queryCoursePackageLists = new QueryCoursePackageLists();
			queryCoursePackageLists.setProvinceCode(provinceCode);
			queryCoursePackageLists.setCityCode(cityCode);
			queryCoursePackageLists.setCoursePackageTypeId(coursePackageTypeId);
			queryCoursePackageLists.setStoreId(storeId);
			queryCoursePackageLists.setStoreIds(storeId);
			queryCoursePackageLists.setName(name);
			queryCoursePackageLists.setState(state);
			queryCoursePackageLists.setStatus(status);
			@@ -138,6 +140,26 @@
			*/
			@Override
			public void updateCoursePackage(TCoursePackage coursePackage, String coursePackagePaymentConfig) {
			String holitime = coursePackage.getHolitime();
			String[] split = holitime.split(" - ");
			String startTime = split[0];
			String endTime = split[1];
			SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
			SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
			try {
			Date parse1 = format1.parse(startTime);
			parse1.setHours(0);
			parse1.setMinutes(0);
			parse1.setSeconds(0);
			Date parse2 = format2.parse(endTime);
			parse2.setHours(23);
			parse2.setMinutes(59);
			parse2.setSeconds(59);
			coursePackage.setStartTime(parse1);
			coursePackage.setEndTime(parse2);
			} catch (ParseException e) {
			e.printStackTrace();
			}
			coursePackageClient.updateCoursePackage(coursePackage);
			coursePackagePaymentConfigClient.delCoursePackagePaymentConfig(coursePackage.getId());
			JSONArray jsonArray = JSON.parseArray(coursePackagePaymentConfig);
			@@ -285,7 +307,12 @@
			coursePackageDiscount1.setCoursePackagePaymentConfigId(coursePackagePaymentConfigId);
			coursePackageDiscount1.setType(type);
			coursePackageDiscount1.setContent(cpd.getString("content"));
			coursePackageDiscount1.setAuditStatus(2);
			if (UserExt.getUser().getObjectType() == 1){
			coursePackageDiscount1.setAuditStatus(2);
			}else if (UserExt.getUser().getObjectType() == 2){
			coursePackageDiscount1.setAuditStatus(1);
			}

			coursePackageDiscount1.setInsertTime(new Date());
			list.add(coursePackageDiscount1);
			}
			@@ -356,7 +383,6 @@
			return coursePackageStudentClient.queryCoursePackageStudentList(queryCoursePackageStudentList);
			}


			/**
			* 取消预约
			* @param id
			@@ -368,9 +394,19 @@
			if(coursePackageStudent.getSignInOrNot() == 1){
			return ResultUtil.error("无法取消预约");
			}
			// TCoursePackagePayment payment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackageStudent.getCoursePackagePaymentId());
			// payment.setAbsencesNumber(payment.getAbsencesNumber()+1);
			// coursePackagePaymentClient.editCoursePackagePayment(payment);


			coursePackageStudent = new CoursePackageStudent();
			coursePackageStudent.setId(id);
			coursePackageStudent.setReservationStatus(0);



			coursePackageStudent.getCoursePackagePaymentId();

			coursePackageStudentClient.editCoursePackageStudent(coursePackageStudent);
			return ResultUtil.success();
			}
			@@ -408,7 +444,7 @@
			}
			List<CoursePackageStudent> coursePackageStudents = coursePackageStudentClient.queryByCoursePackageSchedulingId(id);
			if(coursePackageStudents.size() > 0){
			return ResultUtil.error("不能取消本次");
			// return ResultUtil.error("不能取消本次");
			}
			coursePackageScheduling = new CoursePackageScheduling();
			coursePackageScheduling.setId(id);
			@@ -462,17 +498,19 @@
			}
			TCoursePackagePayment tCoursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackageStudent.getCoursePackagePaymentId());

			if(tCoursePackagePayment.getLaveClassHours() - deductClassHour<0){
			coursePackageStudentClient.editCoursePackageStudent(coursePackageStudent);
			continue;
			if (deductClassHour!=null) {
			if (tCoursePackagePayment.getLaveClassHours() - deductClassHour < 0) {
			coursePackageStudentClient.editCoursePackageStudent(coursePackageStudent);
			continue;
			}
			tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours() - deductClassHour);
			}
			tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours() - deductClassHour);


			if(coursePackageStudent.getSignInOrNot() == 0){
			if(coursePackageStudent.getReservationStatus() == 0){
			tCoursePackagePayment.setAbsencesNumber(tCoursePackagePayment.getAbsencesNumber() + 1);
			}
			coursePackagePaymentClient.editCoursePackagePayment(tCoursePackagePayment);
			System.out.println("====tCoursePackagePayment====="+tCoursePackagePayment);
			coursePackagePaymentClient.editCoursePackagePayment1(tCoursePackagePayment);

			CancelledClasses cancelledClasses = new CancelledClasses();
			cancelledClasses.setType(1);
			@@ -480,7 +518,8 @@
			cancelledClasses.setCoursePackagePaymentId(coursePackageStudent.getCoursePackagePaymentId());
			cancelledClasses.setCoursePackageSchedulingId(coursePackageStudent.getCoursePackageSchedulingId());
			cancelledClasses.setVoucher(cancelClasses);
			cancelledClasses.setCancelledClassesNumber(deductClassHour);
			if (deductClassHour!=null) {
			cancelledClasses.setCancelledClassesNumber(deductClassHour);}
			cancelledClasses.setInsertTime(new Date());
			cancelledClassesClient.addCancelledClasses(cancelledClasses);
			}