Merge branch 'active_course_2021-09-26～29' of http://git.dayaedu.com/yonge/mec into 2021-double-eleven

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

@@ -2250,6 +2250,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			if(activityUserMapper != null){
 				if(vipGroup.getId().equals(activityUserMapper.getGiveVipGroupId())){
 					vipOfflineSalarySettlement = vipGroupSalarySettlementDto.getGiveVipOfflineSalarySettlement();
+				}else if(vipGroup.getId().equals(activityUserMapper.getVipGroupId())){
+					vipOfflineSalarySettlement = vipGroupSalarySettlementDto.getVipOfflineSalarySettlement();
 				}
 			}
 

mec-web/src/main/java/com/ym/mec/web/controller/education/ActivityController.java

@@ -154,6 +154,7 @@ public class ActivityController extends BaseController {
         for (CourseSchedule courseSchedule : practiceGroupApplyDto.getCourseSchedules()) {
             courseSchedule.setEndClassTime(DateUtil.addMinutes(courseSchedule.getStartClassTime(), applyBaseInfo.getSingleClassMinutes()));
         }
+        applyBaseInfo.setEducationalTeacherId(sysUser.getId());
         return practiceGroupService.createActivityPracticeGroup(practiceGroupApplyDto);
     }