Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -119,7 +119,11 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 				// 是否满足条件
 				if (tenantEntryActivities.getSuitableUser() == SuitableUser.NEW) {
 					if (po.getStatus() == DealStatusEnum.ING) {
-						throw new BizException("您参加的首充活动正在处理中，预计于{}分钟后处理完毕，请稍后。", 30 - DateUtil.minutesBetween(po.getCreateTime(), date));
+						int i = 30 - DateUtil.minutesBetween(po.getCreateTime(), date);
+						if(i <= 0){
+							throw new BizException("您的订单出现异常，请联系客服");
+						}
+						throw new BizException("您参加的首充活动正在处理中，预计于{}分钟后处理完毕，请稍后。", i);
 					}
 					if (po.getStatus() == DealStatusEnum.SUCCESS) {
 						throw new BizException("首充优惠活动每个用户限参与一次。");

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -2462,7 +2462,7 @@
                cs.teach_mode_,
                cs.music_group_id_,
                cs.group_type_,
-               su.real_name_                                     teacher_name_
+               su.real_name_ teacher_name_
         FROM course_schedule_student_payment cssp
                  LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
                  LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_

mec-student/src/main/java/com/ym/mec/student/controller/PracticeGroupController.java

@@ -138,7 +138,7 @@ public class PracticeGroupController extends BaseController {
             throw new BizException("请联系老师确认您的所属分部");
         }
         if(!ENABLE_APPLY_ORGANIDS.contains(sysUser.getOrganId())){
-            throw new BizException("所在城市暂不参与此活动");
+            throw new BizException("陪练课预约活动已结束");
         }
         practiceGroup.setStudentId(sysUser.getId());
         return succeed(practiceGroupService.practiceApply(practiceGroup));