update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantPaymentOrderServiceImpl.java

@@ -72,7 +72,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 
 	@Autowired
 	private YqPayFeignService yqPayFeignService;
-
+	
 	@Override
 	public BaseDAO<Long, TenantPaymentOrder> getDAO() {
 		return tenantPaymentOrderDao;
@@ -106,7 +106,6 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 			throw new BizException("活动已结束");
 		}
 
-		int purchaseTimes = 0; // 购买次数
 		// 查询用户订单
 		List<TenantPaymentOrder> orderList = tenantPaymentOrderDao.queryByUserId(userId);
 		if (orderList != null && orderList.size() > 0) {
@@ -114,10 +113,10 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 				// 是否满足条件
 				if (tenantEntryActivities.getSuitableUser() == SuitableUser.NEW) {
 					if (po.getStatus() == DealStatusEnum.ING) {
-						throw new BizException("您存在'处理中' 的订单，请稍后重试（最多需等待30分钟）");
+						throw new BizException("您参加的首充活动正在处理中，预计于{}分钟后处理完毕，请稍后。",30 - DateUtil.minutesBetween(po.getCreateTime(), date));
 					}
 					if (po.getStatus() == DealStatusEnum.SUCCESS) {
-						throw new BizException("您已参与过当前活动，每人只能参与一次");
+						throw new BizException("首充优惠活动每个用户限参与一次。");
 					}
 				}
 			}

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseScheduleController.java

@@ -235,6 +235,11 @@ public class TeacherCourseScheduleController extends BaseController {
 			throw new BizException("调整失败，未开始的课程才能调整");
 		}
 		
+		endDateStr = DateUtil.format(courseSchedule.getClassDate(), "yyyy-MM-dd") + " " + DateUtil.format(courseSchedule.getStartClassTime(), "HH:mm:ss");
+		if (DateUtil.stringToDate(endDateStr, sdf).before(date)) {
+			throw new BizException("调整失败，只能调整到未来的时间");
+		}
+		
         if(Objects.isNull(courseSchedule.getClassGroupId())){
             courseSchedule.setClassGroupId(oldCourseSchedule.getClassGroupId());
         }