Lianxun_Java.git

			@@ -223,6 +223,18 @@
			scheduleClassesStaffDto.setWork(true);
			return;
			}
			//todo 处理排版为 22点-6点当前时间为4点时情况也就是今日4点永远不可能在当前日期的中只能在昨日排版中
			endTime = DateUtil.getDateFromStringA(today + " " + time.getEndTime() + ":00");
			if (endTime.getTime() < startTime.getTime()) {
			Calendar startTimeCal = Calendar.getInstance();
			startTimeCal.setTime(startTime);
			startTimeCal.add(Calendar.DAY_OF_MONTH, -1);
			startTime = startTimeCal.getTime();
			if (DateUtil.belongCalendar(scheduleClassesStaffDto.getToday(), startTime, endTime)) {
			scheduleClassesStaffDto.setWork(true);
			return;
			}
			}
			}
			scheduleClassesStaffDto.setWork(false);
			}
			@@ -299,6 +311,19 @@
			scheduleClassesStaffDto.setWork(true);
			return;
			}

			//todo 处理排版为 22点-6点当前时间为4点时情况也就是今日4点永远不可能在当前日期的中只能在昨日排版中
			endTime = DateUtil.getDateFromStringA(today + " " + time.getEndTime() + ":00");
			if (endTime.getTime() < startTime.getTime()) {
			Calendar startTimeCal = Calendar.getInstance();
			startTimeCal.setTime(startTime);
			startTimeCal.add(Calendar.DAY_OF_MONTH, -1);
			startTime = startTimeCal.getTime();
			if (DateUtil.belongCalendar(scheduleClassesStaffDto.getToday(), startTime, endTime)) {
			scheduleClassesStaffDto.setWork(true);
			return;
			}
			}
			}
			scheduleClassesStaffDto.setWork(false);
			}
			@@ -366,10 +391,12 @@
			return;
			}
			//todo 处理排版为 22点-6点当前时间为4点时情况也就是今日4点永远不可能在当前日期的中只能在昨日排版中
			endTime = DateUtil.getDateFromStringA(today + " " + time.getEndTime() + ":00");
			if (endTime.getTime() < startTime.getTime()) {
			String yesterday = DateUtil.getAddDayStringB(new Date(),-1);
			startTime = DateUtil.getDateFromStringA(yesterday + " " + time.getStartTime() + ":00");
			endTime = DateUtil.getDateFromStringA(today + " " + time.getEndTime() + ":00");
			Calendar startTimeCal = Calendar.getInstance();
			startTimeCal.setTime(startTime);
			startTimeCal.add(Calendar.DAY_OF_MONTH, -1);
			startTime = startTimeCal.getTime();
			if (DateUtil.belongCalendar(scheduleClassesStaffDto.getToday(), startTime, endTime)) {
			scheduleClassesStaffDto.setWork(true);
			return;

	service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-store/src/main/java/com/java110/store/smo/impl/ScheduleClassesStaffV1InnerServiceSMOImpl.java	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -133,6 +133,10 @@
			}
			feeDto = feeDtos.get(0);

			if(!FeeDto.FEE_FLAG_CYCLE.equals(feeDto.getFeeFlag())){
			continue;
			}

			pageEndTime = DateUtil.getDateFromStringB(feeObject.getString("endTime"));
			if (pageEndTime.getTime() <= feeDto.getEndTime().getTime()) {
			throw new IllegalArgumentException("可能存在重复缴费，请刷新页面重新缴费");