Merge branch 'feature/1113-vipCourse' of http://git.dayaedu.com/yonge/cooleshow into feature/1113-vipCourse

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/StudentCourseScheduleController.java

@@ -154,10 +154,6 @@ public class StudentCourseScheduleController extends BaseController {
     @ApiOperation("学生端-约课-老师列表")
     @PostMapping("/queryTeacherList")
     public HttpResponseResult<PageInfo<PracticeTeacherVo>> queryTeacherList(@RequestBody TeacherFreeTimeWrapper.TeacherSearch query) {
-        //声部和课程类型必填
-        if (query.getSubjectId() == null) {
-            throw new BizException("请选择声部");
-        }
         if (StringUtils.isEmpty(query.getCourseType())) {
             throw new BizException("请选择课程类型");
         }

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/ActivityController.java

@@ -3,11 +3,10 @@ package com.yonge.cooleshow.teacher.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.queryInfo.UserRewardQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.ActivityUserRewardService;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.biz.dal.vo.CheckVo;
 import com.yonge.cooleshow.biz.dal.vo.activity.UserRewardWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -18,17 +17,9 @@ import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 
@@ -36,23 +27,16 @@ import java.util.List;
 @RestController
 @RequestMapping("${app-config.url.teacher:}/activity")
 public class ActivityController extends BaseController {
-    private final static Logger log = LoggerFactory.getLogger(ActivityController.class);
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
+    @Resource
+    private SysUserService sysUserService;
 
-    @Autowired
+    @Resource
     private ActivityUserRewardService activityUserRewardService;
 
     @ApiOperation(value = "检查是否存在未领奖")
     @GetMapping("/checkReceiveReward")
     public HttpResponseResult<CheckVo> checkReceiveReward(){
-
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-
-        Boolean b = activityUserRewardService.checkReceiveReward(user.getId(), ClientEnum.TEACHER);
+        Boolean b = activityUserRewardService.checkReceiveReward(sysUserService.getUserId(), ClientEnum.TEACHER);
         YesOrNoEnum check = b?YesOrNoEnum.YES:YesOrNoEnum.NO;
         CheckVo checkVo = new CheckVo();
         checkVo.setCheck(check);
@@ -64,14 +48,9 @@ public class ActivityController extends BaseController {
     @ApiOperation(value = "查看领奖列表")
     @PostMapping("/receiveRewardList")
     public HttpResponseResult<PageInfo<ActivityVo.ReceiveRewardList>> receiveRewardList(@RequestBody ActivityVo.ReceiveRewardQuery query){
-
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
         query.setClient(ClientEnum.TEACHER);
         query.setReceive(YesOrNoEnum.NO);
-        query.setUserId(user.getId());
+        query.setUserId(sysUserService.getUserId());
 
         IPage<UserRewardWrapper> iPage = activityUserRewardService.receiveRewardList(PageUtil.getPage(query), UserRewardQueryInfo.from(query.jsonString()));
 
@@ -86,12 +65,7 @@ public class ActivityController extends BaseController {
     @ApiOperation(value = "领取奖品")
     @PostMapping("/receiveReward/{receiveRewardId}")
     public HttpResponseResult<CheckVo> receiveReward(@PathVariable Long receiveRewardId){
-
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        return status(activityUserRewardService.receiveReward(user.getId(), receiveRewardId));
+        return status(activityUserRewardService.receiveReward(sysUserService.getUserId(), receiveRewardId));
     }
 }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherController.java

@@ -1,23 +1,13 @@
 package com.yonge.cooleshow.teacher.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.TeacherDto;
-import com.yonge.cooleshow.biz.dal.entity.Subject;
-import com.yonge.cooleshow.biz.dal.entity.Teacher;
-import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
-import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
-import com.yonge.cooleshow.biz.dal.entity.TenantUnbindRecord;
+import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.cooleshow.biz.dal.service.SmsCodeService;
-import com.yonge.cooleshow.biz.dal.service.SubjectService;
-import com.yonge.cooleshow.biz.dal.service.SysUserService;
-import com.yonge.cooleshow.biz.dal.service.TeacherService;
-import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
-import com.yonge.cooleshow.biz.dal.service.TenantUnbindRecordService;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.MyFens;
 import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
@@ -35,19 +25,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.Arrays;
 import java.util.List;
@@ -57,46 +39,29 @@ import java.util.stream.Collectors;
 @RequestMapping("${app-config.url.teacher:}/teacher")
 @Api(value = "教师表", tags = "教师表")
 public class TeacherController extends BaseController {
-    @Autowired
+    @Resource
     private TeacherService teacherService;
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-
-    @Autowired
+    @Resource
     private SysUserService sysUserService;
-
-    @Autowired
+    @Resource
     private SmsCodeService smsCodeService;
-
-    @Autowired
+    @Resource
     private TenantUnbindRecordService tenantUnbindRecordService;
-
-    @Autowired
+    @Resource
     private TenantInfoService tenantInfoService;
-
-    @Autowired
+    @Resource
     private SubjectService subjectService;
 
     @ApiOperation(value = "我的-查询教师基本信息")
     @GetMapping("/queryUserInfo")
     public HttpResponseResult<TeacherHomeVo> queryUserInfo() {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        return teacherService.queryUserInfo(user.getId());
+        return teacherService.queryUserInfo(sysUserService.getUserId());
     }
 
     @ApiOperation(value = "设置系统默认客服")
     @GetMapping("/updateUserCustomerService")
     public HttpResponseResult<String> updateUserCustomerService() {
-
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-
-        return succeed(teacherService.updateUserCustomerService(user.getId()));
+        return succeed(teacherService.updateUserCustomerService(sysUserService.getUserId()));
     }
 
 
@@ -105,8 +70,7 @@ public class TeacherController extends BaseController {
      */
     @GetMapping("/detail/{id}")
     public HttpResponseResult<TeacherVo> detail(@PathVariable("id") Long userId) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        Teacher teacher = teacherService.getById(user.getId());
+        Teacher teacher = teacherService.getById(sysUserService.getUserId());
         if (Boolean.FALSE.equals(teacher.getCustomerService())) {
             throw new BizException("权限不足");
         }
@@ -123,28 +87,20 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "开通直播")
     @GetMapping("/openLive")
     public HttpResponseResult<Boolean> openLive() {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        return teacherService.openLive(user.getId());
+        return teacherService.openLive(sysUserService.getUserId());
     }
 
     @ApiOperation(value = "获取老师可授课声部列表")
     @PostMapping("/querySubject")
     public HttpResponseResult<List<Subject>> querySubject() {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        List<Subject> subjects = teacherService.querySubject(user.getId());
+        List<Subject> subjects = teacherService.querySubject(sysUserService.getUserId());
         subjectService.convertSubject(subjects);
         return succeed(subjects);
     }
 
     @ApiOperation(value = "设置声部")
     @GetMapping("/setSubject")
-    public HttpResponseResult setSubject(@ApiParam(value = "声部主键集合", required = true) @RequestParam("subjectIds") String subjectIds) {
+    public HttpResponseResult<Object> setSubject(@ApiParam(value = "声部主键集合", required = true) @RequestParam("subjectIds") String subjectIds) {
         if (StringUtil.isEmpty(subjectIds)) {
             return failed("参数不能为空");
         }
@@ -152,23 +108,14 @@ public class TeacherController extends BaseController {
         if (subjectIds.split(",").length > 5) {
             return failed("最多选择5个乐器");
         }
-
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        return status(teacherService.setSubject(user.getId(), subjectIds) > 0);
+        return status(teacherService.setSubject(sysUserService.getUserId(), subjectIds) > 0);
     }
 
     @ApiOperation(value = "获取声部搜索下拉框")
     @PostMapping("/querySubjectItem")
     public HttpResponseResult<List<Subject>> querySubjectItem(
             @ApiParam(value = "类型 PRACTICE 陪练课 LIVE 直播课 VIDEO 视频课 PIANO_ROOM 琴房 MUSIC 曲目 ") String type) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        List<Subject> subjects = teacherService.querySubjectItem(user.getId(), type);
+        List<Subject> subjects = teacherService.querySubjectItem(sysUserService.getUserId(), type);
         subjectService.convertSubject(subjects);
         return succeed(subjects);
     }
@@ -176,36 +123,23 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "我的-个人风采")
     @GetMapping("/queryTeacherStyle")
     public HttpResponseResult<TeacherVo> queryTeacherStyle() {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        return HttpResponseResult.succeed(teacherService.detail(user.getId()));
+        return HttpResponseResult.succeed(teacherService.detail(sysUserService.getUserId()));
     }
 
     @ApiOperation(value = "我的-个人风采保存")
     @PostMapping("/saveTeacherStyle")
     public HttpResponseResult<TeacherVo> saveTeacherStyle(@RequestBody TeacherDto teacherDto) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
         if (StringUtil.isEmpty(teacherDto.getSubjectId())) {
             return failed("请选择乐器");
         }
-        teacherDto.setUserId(user.getId());
+        teacherDto.setUserId(sysUserService.getUserId());
         return teacherService.saveTeacherStyle(teacherDto);
     }
 
     @ApiOperation(value = "我的粉丝")
     @PostMapping(value = "/queryMyFans")
     public HttpResponseResult<PageInfo<MyFens>> queryMyFans(@RequestBody QueryInfo query) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null || sysUser.getId() == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-
-        IPage<MyFens> pages = teacherService.queryMyFans(PageUtil.getPage(query), sysUser.getId());
+        IPage<MyFens> pages = teacherService.queryMyFans(PageUtil.getPage(query), sysUserService.getUserId());
         return succeed(PageUtil.pageInfo(pages));
     }
 
@@ -213,11 +147,7 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "移除粉丝")
     @PostMapping(value = "/delFans/{userId}")
     public HttpResponseResult<Void> delFans(@PathVariable("userId") Long userId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null || sysUser.getId() == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        teacherService.delFans(userId, sysUser.getId());
+        teacherService.delFans(userId, sysUserService.getUserId());
         return succeed();
     }
 
@@ -228,15 +158,11 @@ public class TeacherController extends BaseController {
     @PostMapping("/defaultSubject")
     @ApiOperation(value = "设置老师默认查询声部")
     public HttpResponseResult defaultSubject(@RequestParam(required = false) Long subjectId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
         if (subjectId == null) {
             return succeed();
         }
         Teacher teacher = new Teacher();
-        teacher.setUserId(sysUser.getId());
+        teacher.setUserId(sysUserService.getUserId());
         teacher.setDefaultSubject(subjectId);
         return succeed(teacherService.updateById(teacher));
     }
@@ -245,11 +171,7 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "实名认证", notes = "传入realNameAuthDto")
     @ResponseBody
     public HttpResponseResult<IdcardInfoExtractor> realNameAuth(@Valid @RequestBody RealnameAuthReq realNameAuthDto) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        IdcardInfoExtractor idcardInfoExtractor = sysUserService.updateUserCard(realNameAuthDto, user,
+        IdcardInfoExtractor idcardInfoExtractor = sysUserService.updateUserCard(realNameAuthDto, sysUserService.getUser(),
                 ClientEnum.TEACHER);
         return succeed(idcardInfoExtractor);
     }
@@ -257,10 +179,7 @@ public class TeacherController extends BaseController {
     @PostMapping("/unbindTenant")
     @ApiOperation(value = "解绑机构申请")
     public HttpResponseResult<Boolean> unbindTenant(@Validated @RequestBody TeacherWrapper.UnbindTenant unbindTenant) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
+        SysUser user = sysUserService.getUser();
         boolean validCode = smsCodeService.verifyValidCode(user.getPhone(), unbindTenant.getCode(), "");
         if (!validCode) {
             return failed("验证码错误");
@@ -323,10 +242,7 @@ public class TeacherController extends BaseController {
     @PostMapping("/unbindTenantCancel")
     @ApiOperation(value = "解绑机构申请撤销")
     public HttpResponseResult<Boolean> unbindTenantCancel() {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
+        SysUser user = sysUserService.getUser();
         boolean update = tenantUnbindRecordService.lambdaUpdate()
                 .eq(TenantUnbindRecord::getUserId, user.getId())
                 .eq(TenantUnbindRecord::getTenantId, user.getTenantId())
@@ -343,11 +259,7 @@ public class TeacherController extends BaseController {
     @GetMapping("/unbindTenantDetail")
     @ApiOperation(value = "解绑机构申请记录")
     public HttpResponseResult<TenantUnbindRecord> unbindTenantDetail() {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-
+        SysUser user = sysUserService.getUser();
         TenantUnbindRecord one = tenantUnbindRecordService.lambdaQuery()
                 .eq(TenantUnbindRecord::getUserId, user.getId())
                 .eq(TenantUnbindRecord::getTenantId, user.getTenantId())

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/HelpCenterContentController.java

@@ -18,6 +18,7 @@ import com.yonge.cooleshow.cms.service.HelpCenterContentService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.toolset.base.page.PageInfo;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 
 @RestController
@@ -25,10 +26,10 @@ import javax.validation.Valid;
 @Api(tags = "帮助中心/公告内容")
 public class HelpCenterContentController extends BaseController {
 
-	@Autowired
+	@Resource
 	private HelpCenterContentService helpCenterContentService;
 
-	@Autowired
+	@Resource
 	private SysUserFeignService sysUserFeignService;
 
 	@ApiOperation(value = "帮助中心/公告内容列表分页查询", httpMethod="POST", consumes="application/json", produces="application/json")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleDao.java

@@ -142,7 +142,7 @@ public interface CourseScheduleDao extends BaseMapper<CourseSchedule> {
     //学生端-首页-最近一堂课
     StudentHomePage.RecentCourses selectRecentCourses(Long studentId);
 
-    //老师端-首页-最近一堂课(陪练课)
+    //老师端-首页-最近一堂课(陪练课\VIP课)
     StudentHomePage.RecentCourses selectRecentCoursesPractice(Long teacherId);
 
     //老师端-首页-最近一堂课(直播课)

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -1019,7 +1019,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             dateList.forEach(item ->
             {
                 if (checkCourseTime(courseTimeCache, CourseTimeEntity::getStartTime, CourseTimeEntity::getEndTime, item.getStartTime(), item.getEndTime())) {
-                    throw new BizException("与缓存中时间存在中途");
+                    throw new BizException("与缓存中时间存在冲突");
                 }
             });
         }
@@ -1380,6 +1380,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             homePage.setRecentCourses(baseMapper.selectRecentCourses(studentId));
         }
         if (studentId == null) {
+            //vip课和陪练课
             StudentHomePage.RecentCourses coursesPractice = baseMapper.selectRecentCoursesPractice(teacherId);
             StudentHomePage.RecentCourses coursesLive = baseMapper.selectRecentCoursesLive(teacherId);//直播课&琴房课共用coursesLive
 
@@ -2628,7 +2629,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             dateList.forEach(item ->
             {
                 if (checkCourseTime(courseTimeCache, CourseTimeEntity::getStartTime, CourseTimeEntity::getEndTime, item.getStartTime(), item.getEndTime())) {
-                    throw new BizException("与缓存中时间存在中途");
+                    throw new BizException("与缓存中时间存在冲突");
                 }
             });
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
@@ -77,12 +76,14 @@ import com.yonge.toolset.thirdparty.user.realname.RealnameAuthenticationPlugin;
 import com.yonge.toolset.utils.date.DateUtil;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 import com.yonge.toolset.utils.string.ValueUtil;
+import org.apache.commons.collections.CollectionUtils;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -200,6 +201,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     @Autowired
     private StudentTotalService studentTotalService;
 
+    @Autowired
+    private TeacherSubjectPriceService teacherSubjectPriceService;
+
     @Override
     public TeacherDao getDao() {
         return baseMapper;
@@ -1001,12 +1005,29 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HttpResponseResult<TeacherVo> saveTeacherStyle(TeacherDto teacherDto) {
+    public HttpResponseResult saveTeacherStyle(TeacherDto teacherDto) {
         //校验敏感词
         if (wordFilter.include(teacherDto.getIntroduction(), 3)) {
             throw new BizException("文本包含敏感信息");
         }
-        //修改老师信息
+        //获取已经配置的vip、陪练课声部
+        List<TeacherSubjectPrice> subjectPrices = teacherSubjectPriceService.lambdaQuery()
+                .eq(TeacherSubjectPrice::getTeacherId, teacherDto.getUserId())
+                .list();
+        if(CollectionUtils.isNotEmpty(subjectPrices)){
+            Map<Long,String> map = new HashMap<>();
+            List<Long> newSubjectIds = Arrays.stream(teacherDto.getSubjectId().split(",")).map(Long::parseLong).collect(Collectors.toList());
+            for (TeacherSubjectPrice subjectPrice : subjectPrices) {
+                if (!newSubjectIds.contains(subjectPrice.getSubjectId())) {
+                    map.put(subjectPrice.getSubjectId(),subjectPrice.getSubjectName());
+                }
+            }
+            if(!map.isEmpty()){
+                String subjectNames = String.join(",", map.values());
+                return HttpResponseResult.failed(HttpStatus.NO_CONTENT,map,subjectNames + "存在售卖中的课程，暂不支持修改");
+            }
+        }
+
         int i = baseMapper.updateById(teacherDto);
         List<TeacherStyleVideo> styleVideo = teacherDto.getStyleVideo();
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentHomePage.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -13,6 +14,7 @@ import java.util.List;
  * @Date: 2022/4/22
  */
 @ApiModel(value = "StudentHomePage")
+@Data
 public class StudentHomePage implements Serializable {
     @ApiModelProperty(value = "直播课")
     private List<Live> liveList;
@@ -21,6 +23,7 @@ public class StudentHomePage implements Serializable {
     @ApiModelProperty(value = "最近课程")
     private RecentCourses recentCourses;
 
+    @Data
     public static class RecentCourses{
         @ApiModelProperty(value = "学生id")
         private Long studentId;
@@ -44,96 +47,9 @@ public class StudentHomePage implements Serializable {
         private String status;
         @ApiModelProperty(value = "开课时间")
         private Date courseStartTime;
-
-        public Long getStudentId() {
-            return studentId;
-        }
-
-        public void setStudentId(Long studentId) {
-            this.studentId = studentId;
-        }
-
-        public String getRealName() {
-            return realName;
-        }
-
-        public void setRealName(String realName) {
-            this.realName = realName;
-        }
-
-        public Long getTeacherId() {
-            return teacherId;
-        }
-
-        public void setTeacherId(Long teacherId) {
-            this.teacherId = teacherId;
-        }
-
-        public String getTeacherName() {
-            return teacherName;
-        }
-
-        public void setTeacherName(String teacherName) {
-            this.teacherName = teacherName;
-        }
-
-        public String getAvatar() {
-            return avatar;
-        }
-
-        public void setAvatar(String avatar) {
-            this.avatar = avatar;
-        }
-
-        public Long getCourseId() {
-            return courseId;
-        }
-
-        public void setCourseId(Long courseId) {
-            this.courseId = courseId;
-        }
-
-        public Long getCourseGroupId() {
-            return courseGroupId;
-        }
-
-        public void setCourseGroupId(Long courseGroupId) {
-            this.courseGroupId = courseGroupId;
-        }
-
-        public String getCourseGroupName() {
-            return courseGroupName;
-        }
-
-        public void setCourseGroupName(String courseGroupName) {
-            this.courseGroupName = courseGroupName;
-        }
-
-        public String getCourseType() {
-            return courseType;
-        }
-
-        public void setCourseType(String courseType) {
-            this.courseType = courseType;
-        }
-
-        public String getStatus() {
-            return status;
-        }
-
-        public void setStatus(String status) {
-            this.status = status;
-        }
-
-        public Date getCourseStartTime() {
-            return courseStartTime;
-        }
-
-        public void setCourseStartTime(Date courseStartTime) {
-            this.courseStartTime = courseStartTime;
-        }
     }
 
+    @Data
     public static class Live {
         @ApiModelProperty(value = "老师id")
         private Long teacherId;
@@ -161,112 +77,9 @@ public class StudentHomePage implements Serializable {
         private Integer subjectId;
         @ApiModelProperty(value = "声部名称")
         private String subjectName;
-
-        public Integer getSubjectId() {
-            return subjectId;
-        }
-
-        public void setSubjectId(Integer subjectId) {
-            this.subjectId = subjectId;
-        }
-
-        public String getSubjectName() {
-            return subjectName;
-        }
-
-        public void setSubjectName(String subjectName) {
-            this.subjectName = subjectName;
-        }
-
-        public String getRealName() {
-            return realName;
-        }
-
-        public void setRealName(String realName) {
-            this.realName = realName;
-        }
-
-        public Integer getBuyCount() {
-            return buyCount;
-        }
-
-        public void setBuyCount(Integer buyCount) {
-            this.buyCount = buyCount;
-        }
-
-        public Long getTeacherId() {
-            return teacherId;
-        }
-
-        public void setTeacherId(Long teacherId) {
-            this.teacherId = teacherId;
-        }
-
-        public String getTeacherName() {
-            return teacherName;
-        }
-
-        public void setTeacherName(String teacherName) {
-            this.teacherName = teacherName;
-        }
-
-        public String getAvatar() {
-            return avatar;
-        }
-
-        public void setAvatar(String avatar) {
-            this.avatar = avatar;
-        }
-
-        public Long getCourseGroupId() {
-            return courseGroupId;
-        }
-
-        public void setCourseGroupId(Long courseGroupId) {
-            this.courseGroupId = courseGroupId;
-        }
-
-        public String getCourseGroupName() {
-            return courseGroupName;
-        }
-
-        public void setCourseGroupName(String courseGroupName) {
-            this.courseGroupName = courseGroupName;
-        }
-
-        public BigDecimal getCourseGroupPrice() {
-            return courseGroupPrice;
-        }
-
-        public void setCourseGroupPrice(BigDecimal courseGroupPrice) {
-            this.courseGroupPrice = courseGroupPrice;
-        }
-
-        public Date getCourseStartTime() {
-            return courseStartTime;
-        }
-
-        public void setCourseStartTime(Date courseStartTime) {
-            this.courseStartTime = courseStartTime;
-        }
-
-        public String getBackgroundPic() {
-            return backgroundPic;
-        }
-
-        public void setBackgroundPic(String backgroundPic) {
-            this.backgroundPic = backgroundPic;
-        }
-
-        public Integer getCourseNum() {
-            return courseNum;
-        }
-
-        public void setCourseNum(Integer courseNum) {
-            this.courseNum = courseNum;
-        }
     }
 
+    @Data
     public static class Video {
         @ApiModelProperty(value = "老师id")
         private Long teacherId;
@@ -294,134 +107,6 @@ public class StudentHomePage implements Serializable {
         private String subjectName;
         @ApiModelProperty(value = "购买人数")
         private Integer buyCount;
-
-        public String getRealName() {
-            return realName;
-        }
-
-        public void setRealName(String realName) {
-            this.realName = realName;
-        }
-
-        public Integer getBuyCount() {
-            return buyCount;
-        }
-
-        public void setBuyCount(Integer buyCount) {
-            this.buyCount = buyCount;
-        }
-
-        public Long getTeacherId() {
-            return teacherId;
-        }
-
-        public void setTeacherId(Long teacherId) {
-            this.teacherId = teacherId;
-        }
-
-        public String getTeacherName() {
-            return teacherName;
-        }
-
-        public void setTeacherName(String teacherName) {
-            this.teacherName = teacherName;
-        }
-
-        public String getAvatar() {
-            return avatar;
-        }
-
-        public void setAvatar(String avatar) {
-            this.avatar = avatar;
-        }
-
-        public Long getVideoGroupId() {
-            return videoGroupId;
-        }
-
-        public void setVideoGroupId(Long videoGroupId) {
-            this.videoGroupId = videoGroupId;
-        }
-
-        public String getVideoGroupName() {
-            return videoGroupName;
-        }
-
-        public void setVideoGroupName(String videoGroupName) {
-            this.videoGroupName = videoGroupName;
-        }
-
-        public BigDecimal getLessonPrice() {
-            return lessonPrice;
-        }
-
-        public void setLessonPrice(BigDecimal lessonPrice) {
-            this.lessonPrice = lessonPrice;
-        }
-
-        public Date getCreateTime() {
-            return createTime;
-        }
-
-        public void setCreateTime(Date createTime) {
-            this.createTime = createTime;
-        }
-
-        public String getLessonCoverUrl() {
-            return lessonCoverUrl;
-        }
-
-        public void setLessonCoverUrl(String lessonCoverUrl) {
-            this.lessonCoverUrl = lessonCoverUrl;
-        }
-
-        public Integer getLessonCount() {
-            return lessonCount;
-        }
-
-        public void setLessonCount(Integer lessonCount) {
-            this.lessonCount = lessonCount;
-        }
-
-        public Integer getSubjectId() {
-            return subjectId;
-        }
-
-        public void setSubjectId(Integer subjectId) {
-            this.subjectId = subjectId;
-        }
-
-        public String getSubjectName() {
-            return subjectName;
-        }
-
-        public void setSubjectName(String subjectName) {
-            this.subjectName = subjectName;
-        }
-    }
-
-    public List<Live> getLiveList() {
-        return liveList;
-    }
-
-    public void setLiveList(List<Live> liveList) {
-        this.liveList = liveList;
-    }
-
-    public List<Video> getVideoList() {
-        return videoList;
-    }
-
-    public void setVideoList(List<Video> videoList) {
-        this.videoList = videoList;
-    }
-
-    public RecentCourses getRecentCourses() {
-        return recentCourses;
-    }
-
-    public void setRecentCourses(RecentCourses recentCourses) {
-        this.recentCourses = recentCourses;
     }
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TeacherFreeTimeWrapper.java

@@ -16,7 +16,7 @@ public class TeacherFreeTimeWrapper {
         private Integer subjectId;
 
         @ApiModelProperty(value = "最近30天空闲标记")
-        private BigDecimal recentFreeTime;
+        private Boolean recentFreeTime;
 
         @ApiModelProperty(value = "课程类型")
         private String courseType;

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -677,7 +677,7 @@
         LEFT JOIN course_group g ON s.course_group_id_=g.id_
         LEFT JOIN course_schedule_student_payment p ON s.id_=p.course_id_
         WHERE s.teacher_id_=#{teacherId}
-        AND s.type_='PRACTICE'
+        AND s.type_ IN ('PRACTICE','VIP')
         AND s.status_ = 'ING'
         ORDER BY ABS(NOW() - s.start_time_) ASC
         limit 1