1、vip课批量新增-后端排课

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

@@ -29,4 +29,4 @@ public interface VipGroupActivityService extends BaseService<Integer, VipGroupAc
      */
     List<VipGroupActivity> findByVipGroupCategory(Long categoryId);
 
-}
+}

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

@@ -1079,7 +1079,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		VipGroupApplyDto vipGroupApplyDto=new VipGroupApplyDto();
 		VipGroupApplyBaseInfoDto vipGroupApplyBaseInfoDto=new VipGroupApplyBaseInfoDto();
 		vipGroupApplyBaseInfoDto.setId(vipGroup.getId());
+		vipGroupApplyDto.setVipGroupApplyBaseInfo(vipGroupApplyBaseInfoDto);
 		vipGroupApplyDto.setCourseSchedules(courseSchedules);
+		vipGroupService.appendVipGroupCourseSchedules(vipGroupApplyDto);
 		classGroupService.updateClassGroupInfo(classGroup.getId());
 	}
 

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

@@ -79,10 +79,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         //获取活动信息
         VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId().intValue());
 
-        if(Objects.isNull(vipGroupActivity)){
-            throw new BizException("未找到活动方案");
-        }
-
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = new ArrayList<>();
         Map<TeachModeEnum, List<CourseSchedule>> courseScheduleGroupByTeachMode = vipCourseSchedules.stream().collect(Collectors.groupingBy(CourseSchedule::getTeachMode));
 
@@ -104,7 +100,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 courseScheduleTeacherSalary.setClassGroupId(courseSchedules.get(i).getClassGroupId());
                 courseScheduleTeacherSalary.setSubsidy(subsidy);
 
-                if (vipGroupActivity.getType() == VipGroupActivityTypeEnum.GIVE_CLASS
+                if (Objects.nonNull(vipGroupActivity)
+                        &&vipGroupActivity.getType() == VipGroupActivityTypeEnum.GIVE_CLASS
                         && vipGroup.getGiveTeachMode() == teachModeEnum
                         && i >= Integer.parseInt(vipGroupActivity.getAttribute1())
                         && "0".equals(vipGroupActivity.getGiveClassPaySalaryFlag())) {

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

@@ -94,6 +94,10 @@ public class VipGroupActivityController extends BaseController {
     @GetMapping("/findByVipGroupCategory")
     @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/findByVipGroupCategory')")
     public Object findByVipGroupCategory(Long categoryId){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("用户信息获取失败");
+        }
         return succeed(vipGroupActivityService.findByVipGroupCategory(categoryId));
     }