Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_1026_1111

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

@@ -83,7 +83,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	@Autowired
 	private SysEmailServiceImpl sysEmailService;
 	// 验证码有效期
-	public static final int CODE_EXPIRE = 60 * 5;
+	public static final int CODE_EXPIRE = 60 * 10;
 	// 发送验证码的间隔时间
 	public static final int CODE_INTERVAL_TIME = 60;
 

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

@@ -466,9 +466,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             courseSchedule.setName(vipGroupApplyBaseInfoDto.getName());
             courseSchedule.setOrganId(vipGroupApplyBaseInfoDto.getOrganId());
         }
+        vipGroupApplyBaseInfoDto.setCourseSchedulesJson(JSON.toJSONString(courseSchedules));
         if (upCourseFlag) {
             vipGroup.setCourseSchedules(courseSchedules);
             courseScheduleDao.batchUpdate(courseSchedules);
+        }else {
+            this.liveProgress(vipGroupApplyBaseInfoDto,classGroup);
         }
         if (vipGroup1.getStatus().equals(VipGroupStatusEnum.PROGRESS)) {
             // 修改课程信息
@@ -500,10 +503,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             imGroupMemberService.join(classGroup.getId().toString(), applyBaseInfo.getEducationalTeacherId(),EFriendRoleType.ORCHESTRA_MANAGER.getMsg(),false);
         }
 
-        if (!vipGroup1.getStatus().equals(VipGroupStatusEnum.PROGRESS)) {
+        if (!vipGroup1.getStatus().equals(VipGroupStatusEnum.PROGRESS) && upCourseFlag) {
             courseScheduleService.checkNewCourseSchedules(courseSchedules, false, false);
         }
-        vipGroupApplyBaseInfoDto.setCourseSchedulesJson(JSON.toJSONString(courseSchedules));
         vipGroupDao.update(vipGroupApplyBaseInfoDto);
         return BaseController.succeed(vipGroupApplyBaseInfoDto.getAuditStatus().getCode());
     }