1、教务端课程交换

2、vip课退课费用及相关逻辑调整
3、补签到、签退

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupService.java

@@ -124,6 +124,15 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
     VipGroupManageDetailDto getVipGroupDetail(Long vipGroupId);
 
     /**
+     * @Author: Joburgess
+     * @Date: 2019/10/3
+     * @params [vipGroupId]
+     * @return com.ym.mec.biz.dal.dto.VipGroupManageDetailDto
+     * @describe 获取vip课详情
+     */
+    VipGroupManageDetailDto getVipGroupDetailForAudit(Long vipGroupId);
+
+    /**
      * @describe 计算vip课程购买总价,及老师课酬
      * @author Joburgess
      * @date 2019/10/23

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

@@ -416,9 +416,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		if(Objects.isNull(teacherAttendanceInfo.getCourseScheduleId())){
 			throw new BizException("请指定课程");
 		}
-		if(Objects.isNull(teacherAttendanceInfo.getTeacherId())){
-			throw new BizException("请指定教师");
-		}
 		if(Objects.isNull(teacherAttendanceInfo.getSignInStatus())){
 			throw new BizException("请指定签到状态");
 		}
@@ -431,6 +428,13 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		}
 		TeacherAttendance teacherAttendance=teacherAttendanceDao.findByTeacherAttendanceInfo(teacherAttendanceInfo.getTeacherId().longValue(),teacherAttendanceInfo.getCourseScheduleId());
 
+		if(Objects.isNull(teacherAttendanceInfo.getTeacherId())){
+			if(Objects.isNull(courseSchedule.getActualTeacherId())){
+				throw new BizException("请指定教师");
+			}
+			teacherAttendanceInfo.setTeacherId(courseSchedule.getActualTeacherId());
+		}
+
 		Date date = new Date();
 		if(Objects.isNull(teacherAttendance)){
 			teacherAttendance=new TeacherAttendance();

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

@@ -714,6 +714,21 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	}
 
 	@Override
+	public VipGroupManageDetailDto getVipGroupDetailForAudit(Long vipGroupId) {
+		if(Objects.isNull(vipGroupId)){
+			throw new BizException("请指定vip课程");
+		}
+		VipGroupManageDetailDto vipGroupBaseInfo = vipGroupDao.getVipGroupBaseInfo(vipGroupId);
+		vipGroupBaseInfo.setSubjectName(StringUtils.join(subjectDao.findBySubIds(vipGroupBaseInfo.getSubjectIdList()),","));
+		ClassGroupTeacherSalary byVipGoupAndTeacher = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupId.intValue(), vipGroupBaseInfo.getUserId());
+		if(Objects.nonNull(byVipGoupAndTeacher)){
+			vipGroupBaseInfo.setOnlineTeacherSalary(byVipGoupAndTeacher.getOnlineClassesSalary());
+			vipGroupBaseInfo.setOfflineTeacherSalary(byVipGoupAndTeacher.getSalary());
+		}
+		return vipGroupBaseInfo;
+	}
+
+	@Override
 	public PageInfo findVipGroupAttendances(VipGroupAttendanceQueryInfo queryInfo) {
 		PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
@@ -2583,7 +2598,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			
 			for (VipGroup noCreateSuccessVipGroup : noCreateSuccessVipGroups) {
 				//推送消息
-				stopVipPush(noCreateSuccessVipGroup.getId(),noCreateSuccessVipGroup.getName());
+				if(noCreateSuccessVipGroup.getStatus().equals(VipGroupStatusEnum.CANCEL)) {
+					stopVipPush(noCreateSuccessVipGroup.getId(), noCreateSuccessVipGroup.getName());
+				}
 			}
 		}
 	}

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupManageController.java

@@ -141,6 +141,13 @@ public class VipGroupManageController extends BaseController {
         return succeed(vipGroupService.getVipGroupDetail(vipGroupId));
     }
 
+    @ApiOperation(value = "vip课详情")
+    @GetMapping("/getVipGroupDetailForAudit")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/getVipGroupDetailForAudit')")
+    public Object getVipGroupDetailForAudit(Long vipGroupId){
+        return succeed(vipGroupService.getVipGroupDetail(vipGroupId));
+    }
+
     @ApiOperation(value = "获取vip课考勤记录")
     @PostMapping("/getVipGroupAttendances")
     @PreAuthorize("@pcs.hasPermissions('vipGroupManage/getVipGroupAttendances')")