java/PlayPai.git

			@@ -401,9 +401,33 @@
			}
			List<CoursePackageStudent> coursePackageStudents = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>()
			.eq("coursePackageId",coursePackage.getId())
			.eq("studentId",appUserId ));
			.eq("appUserId",appUserId ));

			List<Long> ids = new ArrayList<>();
			for (CoursePackageStudent coursePackageStudent : coursePackageStudents) {
			ids.add(coursePackageStudent.getCoursePackageSchedulingId());
			}
			List<CoursePackageScheduling> cps =new ArrayList<>();

			if (!ids.isEmpty()) {
			cps = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id", ids));
			}
			Integer counts = 0;

			for (CoursePackageScheduling cp : cps) {
			if (cp.getDeductClassHour()!=null) {
			counts = counts + cp.getDeductClassHour();
			}
			}


			// Integer counts = cpsMapper.selectCount(new QueryWrapper<CoursePackageStudent>()
			// .eq("coursePackageId",coursePackage.getId())
			// .eq("appUserId",appUserId ));

			if (coursePackageStudents.size() > 0 ){
			registerCourseVo.setCourseNums(coursePackageStudents.size() * 2);
			// registerCourseVo.setCourseNums(coursePackageStudents.size() * 2);
			registerCourseVo.setCourseNums(counts);
			}
			registerCourseVo.setPayStatus(tCoursePackagePayment.getPayStatus());
			courseVos.add(registerCourseVo);
			@@ -433,15 +457,22 @@
			return courseVos;
			}

			@Autowired
			private ICoursePackagePaymentConfigService coursePackagePaymentConfigService;

			@Autowired
			private TCoursePackageDiscountService coursePackageDiscountService;

			@Override
			public CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId) {
			AppUser appUser = appuClient.queryAppUser(appUserId);
			CourseDetailsResponse response = new CourseDetailsResponse();
			TCoursePackagePayment tCoursePackagePayment = this.baseMapper.selectById(coursePayId);

			if (null != tCoursePackagePayment){
			TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
			if (coursePackage.getType()==2) {
			response.setTime(new SimpleDateFormat("yyyy-MM-dd").format(coursePackage.getStartTime()) + "-" + new SimpleDateFormat("yyyy-MM-dd").format(coursePackage.getEndTime()));
			response.setTime(new SimpleDateFormat("yyyy.MM.dd").format(coursePackage.getStartTime()) + "-" + new SimpleDateFormat("yyyy.MM.dd").format(coursePackage.getEndTime()));
			}


			@@ -506,17 +537,157 @@
			}
			}

			switch (payType) {
			case 1:
			case 2:
			response.setAmount(cashPaymentValue);
			response.setVipAmount(discountMember);
			break;
			case 3:
			response.setWpGold(playPaiCoin);
			break;
			}
			// switch (payType) {
			// case 1:
			// case 2:
			// response.setAmount(cashPaymentValue);
			// response.setVipAmount(discountMember);
			// break;
			// case 3:
			// response.setWpGold(playPaiCoin);
			// break;
			// }

			// coursePackage.get


			response.setPayStatus(tCoursePackagePayment.getPayStatus());


			List<CoursePackagePaymentConfigVo> list = new ArrayList<>();
			List<CoursePackagePaymentConfig> list1 = coursePackagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>().eq("coursePackageId", coursePackage.getId()).orderByAsc("classHours"));
			list1.forEach(coursePackagePaymentConfig -> {
			CoursePackagePaymentConfigVo coursePackagePaymentConfigVo = new CoursePackagePaymentConfigVo();
			coursePackagePaymentConfigVo.setId(coursePackagePaymentConfig.getId());
			coursePackagePaymentConfigVo.setClassHours(coursePackagePaymentConfig.getClassHours());
			coursePackagePaymentConfigVo.setPlayPaiCoin(coursePackagePaymentConfig.getPlayPaiCoin());

			if(ToolUtil.isNotEmpty(coursePackagePaymentConfig.getCashPayment()) && coursePackagePaymentConfig.getCashPayment()>0 && ToolUtil.isNotEmpty(coursePackagePaymentConfig.getPlayPaiCoin()) && coursePackagePaymentConfig.getPlayPaiCoin()>0 ){
			coursePackagePaymentConfigVo.setPayType(3);
			}else if(ToolUtil.isNotEmpty(coursePackagePaymentConfig.getCashPayment()) && coursePackagePaymentConfig.getCashPayment()>0){
			coursePackagePaymentConfigVo.setPayType(1);
			}else if( ToolUtil.isNotEmpty(coursePackagePaymentConfig.getPlayPaiCoin()) && coursePackagePaymentConfig.getPlayPaiCoin()>0 ){
			coursePackagePaymentConfigVo.setPayType(2);
			}

			// coursePackagePaymentConfigVo.setPayType(coursePackage.getPayType());
			//会员显示原价和支付价（会员价）。非会员显示会员价和支付价（最低）
			if(appUser.getIsVip() == 0){//非会员
			List<TCoursePackageDiscount> list2 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
			.eq("type", 1).eq("auditStatus", 2));
			Double vipPrice = coursePackagePaymentConfig.getCashPayment();
			for (TCoursePackageDiscount coursePackageDiscount1 : list2) {
			Double num1 = JSON.parseObject(coursePackageDiscount1.getContent()).getDouble("discountMember");
			if(vipPrice.compareTo(num1) > 0){
			vipPrice = num1;
			}
			}
			coursePackagePaymentConfigVo.setVipPrice(vipPrice);
			Double paymentPrice = coursePackagePaymentConfig.getCashPayment();
			List<TCoursePackageDiscount> list3 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
			.eq("type", 3).eq("auditStatus", 2));
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			for (TCoursePackageDiscount coursePackageDiscount2 : list3) {
			/**
			* [{
			* "startDate": "2023-01-01 00:00:00",
			* "endDate": "2023-12-31 23:59:59",
			* "startTime": "02:00:00",
			* "endTime": "23:00:00",
			* "weeks": [1, 2, 7],
			* "cashPayment": 100
			* }]
			*/
			JSONArray jsonArray = JSON.parseArray(coursePackageDiscount2.getContent());
			for (int i = 0; i < jsonArray.size(); i++) {
			try {
			JSONObject jsonObject = jsonArray.getJSONObject(i);
			String startDate = jsonObject.getString("startDate");
			String endDate = jsonObject.getString("endDate");
			String startTime = jsonObject.getString("startTime");
			String endTime = jsonObject.getString("endTime");
			List<Integer> weeks = jsonObject.getJSONArray("weeks").toJavaList(Integer.class);
			Double cashPayment2 = jsonObject.getDouble("cashPayment");
			Date startDate_date = sdf.parse(startDate);
			Date endDate_date = sdf.parse(endDate);
			long timeMillis = System.currentTimeMillis();
			if(timeMillis >= startDate_date.getTime() && timeMillis < endDate_date.getTime()){
			Date date = new Date();
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(date);
			int week = calendar.get(Calendar.DAY_OF_WEEK);
			boolean isFirstSunday = (calendar.getFirstDayOfWeek() == Calendar.SUNDAY);
			if(isFirstSunday){
			week = week - 1;
			if(week == 0){
			week = 7;
			}
			}
			if(!weeks.contains(week)){
			continue;
			}

			String[] split1 = startTime.split(":");
			Integer hour1 = Integer.valueOf(split1[0]);
			Calendar s = Calendar.getInstance();
			s.setTime(date);
			s.set(Calendar.HOUR_OF_DAY, hour1);
			s.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
			s.set(Calendar.SECOND, Integer.valueOf(split1[2]));

			String[] split2 = endTime.split(":");
			Integer hour2 = Integer.valueOf(split2[0]);
			Calendar e = Calendar.getInstance();
			e.setTime(date);
			e.set(Calendar.HOUR_OF_DAY, hour2);
			e.set(Calendar.MINUTE, Integer.valueOf(split2[1]));
			e.set(Calendar.SECOND, Integer.valueOf(split2[2]));

			if(hour1 > hour2){
			if(s.getTimeInMillis() > date.getTime()){
			s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
			}else{
			e.set(Calendar.DAY_OF_YEAR, e.get(Calendar.DAY_OF_YEAR) + 1);
			}
			}
			if(timeMillis >= s.getTimeInMillis() && timeMillis < e.getTimeInMillis() && paymentPrice.compareTo(cashPayment2) > 0){
			paymentPrice = cashPayment2;
			}
			}
			}catch (Exception e){
			e.printStackTrace();
			}
			}
			}
			coursePackagePaymentConfigVo.setPaymentPrice(paymentPrice);

			if (coursePackagePaymentConfigVo.getPaymentPrice()<coursePackagePaymentConfigVo.getVipPrice()){
			coursePackagePaymentConfigVo.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
			coursePackagePaymentConfigVo.setVipPrice(null);
			}

			}
			else{
			List<TCoursePackageDiscount> list2 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
			.eq("type", 1).eq("auditStatus", 2));
			Double vipPrice = coursePackagePaymentConfig.getCashPayment();
			for (TCoursePackageDiscount coursePackageDiscount3 : list2) {
			Double num1 = JSON.parseObject(coursePackageDiscount3.getContent()).getDouble("discountMember");
			if(vipPrice.compareTo(num1) > 0){
			vipPrice = num1;
			}
			}
			coursePackagePaymentConfigVo.setPaymentPrice(vipPrice);
			coursePackagePaymentConfigVo.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
			}
			list.add(coursePackagePaymentConfigVo);
			});
			// coursePackageInfo.setList(list);





			}
			return response;
			}
			@@ -787,7 +958,7 @@

			// int pageNum = 1; // 页码
			int pageSize = 100; // 每页记录数
			Page<CoursePackageStudent> page = new Page<>(1, pageSize);
			Page<CoursePackageStudent> page = new Page<>(pageNum, pageSize);

			// for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {
			// List<CoursePackageStudent> coursePackageStudent1 = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>()
			@@ -870,12 +1041,15 @@
			} catch (ParseException e) {
			throw new RuntimeException(e);
			}
			//已取消
			if (byId.getStatus()==4){
			recordVo.setStatus(4);
			} else if(coursePackageStudent.getSignInOrNot()==2){
			//已请假
			recordVo.setStatus(5);
			}
			else if (start.after(new Date())){
			//待上课
			recordVo.setStatus(1);
			}
			// else if(coursePackageStudent.getSignInOrNot()==2){
			@@ -894,7 +1068,13 @@
			}

			}else {
			recordVo.setStatus(2);
			Date now = new Date();
			if (now.after(byId.getClassDate())&&now.before(byId.getEndDate())){
			recordVo.setStatus(2);
			}else {
			recordVo.setStatus(3);

			}
			}
			}
			}else {
			@@ -1232,15 +1412,17 @@
			TCoursePackage tCoursePackage = tcpmapper.selectById(req.getCourseId());
			// 添加课包
			TCoursePackagePayment tCoursePackagePayment1 = new TCoursePackagePayment();
			tCoursePackagePayment1.setAppUserId(userId);
			Student student = studentClient.queryDefaultStudent(userId);
			// student ID
			Integer sId=null;
			if(student!=null){
			tCoursePackagePayment1.setStudentId(student.getId());
			sId=student.getId();
			}
			// tCoursePackagePayment1.setAppUserId(userId);
			// Student student = studentClient.queryDefaultStudent(userId);
			// // student ID
			//
			// Integer sId=null;
			// if(student!=null){
			// tCoursePackagePayment1.setStudentId(student.getId());
			// sId=student.getId();
			// }
			tCoursePackagePayment1.setCoursePackageId(tCoursePackage.getId());
			tCoursePackagePayment1.setStudentId(req.getStuId());
			tCoursePackagePayment1.setPayType(7);
			tCoursePackagePayment1.setClassHours(req.getNum());
			tCoursePackagePayment1.setOriginalPrice(0.0);
			@@ -1251,6 +1433,7 @@
			tCoursePackagePayment1.setPayStatus(2);
			tCoursePackagePayment1.setPayUserId(userId);
			tCoursePackagePayment1.setStatus(1);
			tCoursePackagePayment1.setAppUserId(userId);
			tCoursePackagePayment1.setState(1);
			tCoursePackagePayment1.setInsertTime(new Date());
			this.baseMapper.insert(tCoursePackagePayment1);
			@@ -1275,7 +1458,7 @@

			CoursePackageStudent student1 = new CoursePackageStudent();
			student1.setAppUserId(userId);
			student1.setStudentId(sId);
			student1.setStudentId(req.getStuId());
			student1.setCoursePackageId(tCoursePackage.getId());
			student1.setCoursePackagePaymentId(tCoursePackagePayment1.getId());
			student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());