Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-common/src/main/java/com/yonge/cooleshow/common/constant/CommonConstants.java

@@ -40,4 +40,10 @@ public interface CommonConstants {
 	Integer DECIMAL_FINAL_PLACE = 2;
 
 	String DEFULT_PASSWORD = "123456";
+	/***
+	 * redis缓存分隔符
+	 * @author liweifan
+	 * @updateTime 2022/3/28 16:29
+	 */
+	String REDIS_SPLIT = ":";
 }

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

@@ -28,5 +28,14 @@ public interface TeacherFreeTimeDao extends BaseMapper<TeacherFreeTime> {
     TeacherFreeTime findOne(@Param("teacherId") Long teacherId,
                             @Param("courseMinutes") Integer courseMinutes,
                             @Param("freeMinutes") Integer freeMinutes);
+
+    /**
+    * @description: 修改默认配置
+     * @param defaultFlag
+    * @return void
+    * @author zx
+    * @date 2022/3/29 10:02
+    */
+    void updateDefaultFlag(@Param("defaultFlag") boolean defaultFlag, @Param("teacherId") Long teacherId);
 }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/AuthEntryRecordSearch.java

@@ -26,7 +26,7 @@ public class AuthEntryRecordSearch {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
-    @ApiModelProperty(value = "审核状态  1、审核中 2、通过 3、不通过")
+    @ApiModelProperty(value = "审核状态  0、未申请 1、审核中 2、通过 3、不通过")
     private AuthStatusEnum authStatus;
 
     public String getSearch() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -75,7 +75,7 @@ public class MusicSheet extends BaseEntity {
     private Integer chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
     @TableField("audit_status_")
-    @ApiModelProperty(value = "审核状态")
+    @ApiModelProperty(value = "审核状态(0:待审核;1:通过;2:未通过)")
     private Integer auditStatus;  //审核状态(0:待审核;1:通过;2:未通过)
 
     @TableField("sort_number_")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherAuthEntryRecord.java

@@ -78,10 +78,8 @@ public class TeacherAuthEntryRecord implements Serializable {
     @ApiModelProperty("教师资格证 ")
 	@TableField(value = "teacher__certificate_")
     private String teacherCertificate;
-    /** 
-    * 老师认证审核状态  1、审核中 2、通过 3、不通过 
-    */
-    @ApiModelProperty("老师认证审核状态  1、审核中 2、通过 3、不通过 ")
+
+    @ApiModelProperty("老师认证审核状态 1、审核中 2、通过 3、不通过 ")
 	@TableField(value = "teacher_auth_status_")
     private AuthStatusEnum teacherAuthStatus;
     /** 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherAuthMusicianRecord.java

@@ -32,10 +32,8 @@ public class TeacherAuthMusicianRecord implements Serializable {
     @ApiModelProperty("对应user表用户编号 ")
 	@TableField(value = "user_id_")
     private Long userId;
-    /** 
-    * 老师认证审核状态  1、审核中 2、通过 3、不通过 
-    */
-    @ApiModelProperty("老师认证审核状态  1、审核中 2、通过 3、不通过 ")
+
+    @ApiModelProperty("老师认证审核状态 1、审核中 2、通过 3、不通过 ")
 	@TableField(value = "teacher_auth_status_")
     private AuthStatusEnum teacherAuthStatus;
     /** 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherFreeTime.java

@@ -75,6 +75,10 @@ public class TeacherFreeTime implements Serializable {
     @ApiModelProperty(value = "周日;")
     private String sunday;
 
+    @TableField("default_flag_")
+    @ApiModelProperty(value = "是否默认配置")
+    private Boolean defaultFlag = true;
+
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间;")
     private Date createTime;
@@ -83,6 +87,13 @@ public class TeacherFreeTime implements Serializable {
     @ApiModelProperty(value = "修改时间;")
     private Date updateTime;
 
+    public Boolean getDefaultFlag() {
+        return defaultFlag;
+    }
+
+    public void setDefaultFlag(Boolean defaultFlag) {
+        this.defaultFlag = defaultFlag;
+    }
 
     public Long getId() {
         return id;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AuthStatusEnum.java

@@ -10,6 +10,7 @@ import com.yonge.cooleshow.common.enums.BaseEnum;
  * @Data: 2022/3/16 10:19
  */
 public enum AuthStatusEnum implements BaseEnum<Integer, AuthStatusEnum> {
+    UNPAALY(0,"未申请"),
     DOING(1, "审核中"),
     PASS(2, "通过"),
     UNPASS(3, "不通过");

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/CacheNameEnum.java

@@ -0,0 +1,67 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.yonge.cooleshow.common.constant.CommonConstants;
+import com.yonge.cooleshow.common.enums.BaseEnum;
+import org.apache.commons.lang3.StringUtils;
+
+import java.time.Duration;
+
+/**
+ * redis缓存枚举
+ *
+ * @Author: liweifan
+ * @Data: 2022/3/28 16:24
+ */
+public enum CacheNameEnum implements BaseEnum<String, CacheNameEnum> {
+
+    TEACHER_HOME_TOTAL("老师首页统计缓存");
+    /***
+     * 缓存描述
+     * @author liweifan
+     * @updateTime 2022/3/28 16:31
+     */
+    private String msg;
+    /***
+     * 缓存时长
+     * @author liweifan
+     * @updateTime 2022/3/28 16:31
+     */
+    private Duration duration;
+
+    CacheNameEnum(String msg) {
+        this.msg = msg;
+    }
+
+    CacheNameEnum(String msg, Duration duration) {
+        this.msg = msg;
+        this.duration = duration;
+    }
+
+    @Override
+    public String getCode() {
+        return this.name();
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public String getRedisKey(Object... detils) {
+        String key = this.getCode();
+        for (Object detil : detils) {
+            try {
+                if (!CommonConstants.REDIS_SPLIT.equals(key.substring(key.length() - 1))) {
+                    key += CommonConstants.REDIS_SPLIT;
+                }
+                if (null != detil && StringUtils.isNotBlank(detil.toString())) {
+                    key += detil.toString();
+                }
+            } catch (Exception e) {
+            }
+        }
+        if (CommonConstants.REDIS_SPLIT.equals(key.substring(key.length() - 1))) {
+            key = key.substring(0, key.length() - 1);
+        }
+        return key;
+    }
+}

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

@@ -2,11 +2,13 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.req.UserSetReq;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherSubmitReq;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherSearch;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
+import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.biz.dal.vo.UserSetVo;
@@ -43,6 +45,14 @@ public interface TeacherService extends IService<Teacher>  {
      */
     HttpResponseResult<Boolean> submit(TeacherSubmitReq teacherSubmitReq);
     /***
+     * 查询老师首页统计信息
+     * @author liweifan
+     * @param: id
+     * @updateTime 2022/3/28 16:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo
+     */
+    HttpResponseResult<TeacherHomeVo> queryUserInfo(SysUser user);
+    /***
      * 开通直播
      * @author liweifan
      * @param: setReq
@@ -67,4 +77,6 @@ public interface TeacherService extends IService<Teacher>  {
      * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo>
      */
     List<TeacherTotalVo> queryTeacherHomeTotal();
+
+
 }

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

@@ -65,7 +65,11 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
         if (hasApply(sysUser.getId())) {
             return HttpResponseResult.failed("已经提交过申请");
         }
-        //todo 判断用户是否已经通过申请
+        //判断用户是否已经通过申请
+        Teacher teacher = teacherDao.selectById(sysUser.getId());
+        if (teacher.getEntryFlag().equals(YesOrNoEnum.YES)) {
+            return HttpResponseResult.failed("已经通过审批");
+        }
         //修改用户表
         baseMapper.updateUserCard(teacherApplyDetailDto);
         //新增申请记录

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

@@ -45,15 +45,19 @@ public class TeacherAuthMusicianRecordServiceImpl extends ServiceImpl<TeacherAut
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HttpResponseResult<Boolean> doApply(Long id) {
+    public HttpResponseResult<Boolean> doApply(Long userId) {
         //判断用户是否已经提交申请
-        if (hasApply(id)) {
+        if (hasApply(userId)) {
             return HttpResponseResult.failed("已经提交过申请");
         }
-        //todo 判断用户是否已经通过申请
+        //判断用户是否已经通过申请
+        Teacher teacher = teacherDao.selectById(userId);
+        if(teacher.getMusicianFlag().equals(YesOrNoEnum.YES)){
+            return HttpResponseResult.failed("已经通过审批");
+        }
 
         TeacherAuthMusicianRecord record = new TeacherAuthMusicianRecord();
-        record.setUserId(id);
+        record.setUserId(userId);
         record.setTeacherAuthStatus(AuthStatusEnum.DOING);
         return HttpResponseResult.status(baseMapper.insert(record) > 0);
     }

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

@@ -38,6 +38,8 @@ public class TeacherFreeTimeServiceImpl extends ServiceImpl<TeacherFreeTimeDao,
         if(Objects.nonNull(oldTeacherFreeTime)){
             baseMapper.deleteById(oldTeacherFreeTime.getId());
         }
+        //将其他配置改为非默认
+        baseMapper.updateDefaultFlag(false,teacherFreeTime.getTeacherId());
         Date date = new Date();
         teacherFreeTime.setCreateTime(date);
         teacherFreeTime.setUpdateTime(date);

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

@@ -7,36 +7,37 @@ 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.auth.api.enums.SysUserType;
+import com.yonge.cooleshow.biz.dal.constant.SysConfigConstant;
 import com.yonge.cooleshow.biz.dal.dao.CourseScheduleDao;
 import com.yonge.cooleshow.biz.dal.dao.EmployeeDao;
 import com.yonge.cooleshow.biz.dal.dao.StudentStarDao;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherSubmitReq;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherSearch;
-import com.yonge.cooleshow.biz.dal.entity.Subject;
-import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
+import com.yonge.cooleshow.biz.dal.entity.*;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.CacheNameEnum;
 import com.yonge.cooleshow.biz.dal.enums.TeacherTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
-import com.yonge.cooleshow.biz.dal.service.TeacherStyleVideoService;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
+import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.exception.BizException;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
+import org.apache.poi.ss.formula.functions.T;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
-import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
-import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
-
 @Service
 public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> implements TeacherService {
     @Autowired
@@ -46,12 +47,17 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     @Autowired
     private TeacherAuthEntryRecordService entryRecordService;
     @Autowired
+    private TeacherAuthMusicianRecordService musicianRecordService;
+    @Autowired
     private EmployeeDao employeeDao;
     @Autowired
     private StudentStarDao studentStarDao;
     @Autowired
     private CourseScheduleDao courseScheduleDao;
-
+    @Autowired
+    private RedissonClient redissonClient;
+    @Autowired
+    private SysConfigService sysConfigService;
 
     @Override
     public TeacherVo detail(Long userId) {
@@ -84,9 +90,54 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     }
 
     @Override
+    public HttpResponseResult<TeacherHomeVo> queryUserInfo(SysUser user) {
+        Teacher teacher = getById(user.getId());
+        if (null == teacher) {
+            return HttpResponseResult.failed("未查询到老师信息");
+        }
+        TeacherHomeVo teacherHomeVo = new TeacherHomeVo();
+        teacherHomeVo.setUserId(user.getId());
+        teacherHomeVo.setHeardUrl(user.getAvatar());
+        teacherHomeVo.setUsername(user.getUsername());
+        teacherHomeVo.setLiveFlag(teacher.getLiveFlag());
+
+        TeacherAuthEntryRecord entryRecord = entryRecordService.getLastRecordByUserId(user.getId());
+        if (null == entryRecord) {
+            teacherHomeVo.setEntryStatus(AuthStatusEnum.UNPAALY);
+        } else {
+            teacherHomeVo.setEntryStatus(entryRecord.getTeacherAuthStatus());
+        }
+
+        TeacherAuthMusicianRecord musicianRecord = musicianRecordService.getLastRecordByUserId(user.getId());
+        if (null == musicianRecord) {
+            teacherHomeVo.setMusicianAuthStatus(AuthStatusEnum.UNPAALY);
+        } else {
+            teacherHomeVo.setMusicianAuthStatus(musicianRecord.getTeacherAuthStatus());
+        }
+
+        TeacherTotalVo totalVo = (TeacherTotalVo) redissonClient.getBucket(CacheNameEnum.TEACHER_HOME_TOTAL.getRedisKey(user.getId())).get();
+        if (null == totalVo) {
+            totalVo = new TeacherTotalVo();
+        }
+        teacherHomeVo.setStarGrade((null == totalVo.getStarGrade()) ? 0 : totalVo.getStarGrade().intValue());
+        teacherHomeVo.setFansNum((null == totalVo.getFansNum()) ? 0 : totalVo.getFansNum());
+        teacherHomeVo.setExpTime((null == totalVo.getExpTime()) ? 0 : totalVo.getExpTime());
+        teacherHomeVo.setUnExpTime((null == totalVo.getUnExpTime()) ? 0 : totalVo.getUnExpTime());
+        return HttpResponseResult.succeed(teacherHomeVo);
+    }
+
+    @Override
     public HttpResponseResult<Boolean> openLive(Long id) {
-        //todo 根据老师规则，判断老师直播权限
-        if (true) {
+        TeacherTotalVo totalVo = (TeacherTotalVo) redissonClient.getBucket(CacheNameEnum.TEACHER_HOME_TOTAL.getRedisKey(id)).get();
+        if (null == totalVo) {
+            return HttpResponseResult.succeed(false);
+        }
+        //开通直播需要粉丝数
+        Integer fansNum = Integer.parseInt(sysConfigService.findByParamName(SysConfigConstant.OPEN_LIVE_FANS_NUM).getParamValue());
+        //开通直播需要已完成课时数
+        Integer overClass = Integer.parseInt(sysConfigService.findByParamName(SysConfigConstant.OPEN_LIVE_OVER_CLASS).getParamValue());
+        //根据老师规则，判断老师直播权限
+        if (totalVo.getFansNum() > fansNum && totalVo.getExpTime() > overClass) {
             Teacher teacher = new Teacher();
             teacher.setUserId(id);
             teacher.setLiveFlag(YesOrNoEnum.YES);
@@ -120,21 +171,23 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         for (Teacher teacher : teachers) {
             TeacherTotalVo totalVo = new TeacherTotalVo();
             totalVo.setUserId(teacher.getUserId());
-            TeacherTotalVo fansTotal= teacherStarMap.get(teacher.getUserId());
-            if(null != fansTotal){
+            TeacherTotalVo fansTotal = teacherStarMap.get(teacher.getUserId());
+            if (null != fansTotal) {
                 totalVo.setFansNum(fansTotal.getFansNum());
             }
-            TeacherTotalVo courseTotal= teacherCourseMap.get(teacher.getUserId());
-            if(null != courseTotal){
+            TeacherTotalVo courseTotal = teacherCourseMap.get(teacher.getUserId());
+            if (null != courseTotal) {
                 totalVo.setExpTime(courseTotal.getExpTime());
                 totalVo.setUnExpTime(courseTotal.getUnExpTime());
                 Double starGrade = courseTotal.getStarGrade();
-                if(null != starGrade){
+                if (null != starGrade) {
                     Long round = Math.round(starGrade);
                     totalVo.setStarGrade(round.doubleValue());
                 }
             }
             resultList.add(totalVo);
+            redissonClient.getBucket(CacheNameEnum.TEACHER_HOME_TOTAL.getRedisKey(totalVo.getUserId()))
+                    .set(totalVo);
         }
         return resultList;
     }

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

@@ -31,9 +31,9 @@ public class TeacherHomeVo {
     private Integer expTime;
     @ApiModelProperty("未上课时")
     private Integer unExpTime;
-    @ApiModelProperty("老师入驻状态  1、审核中 2、通过 3、不通过 ")
+    @ApiModelProperty("老师入驻状态 0、未申请  1、审核中 2、通过 3、不通过 ")
     private AuthStatusEnum entryStatus;
-    @ApiModelProperty("音乐人审核状态  1、审核中 2、通过 3、不通过 ")
+    @ApiModelProperty("音乐人审核状态  0、未申请 1、审核中 2、通过 3、不通过 ")
     private AuthStatusEnum musicianAuthStatus;
     @ApiModelProperty("是否有直播权限 0 否 1 是")
     private YesOrNoEnum liveFlag;

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

@@ -39,7 +39,7 @@ public class TeacherTotalVo {
     }
 
     public Integer getFansNum() {
-        return fansNum;
+        return null == fansNum ? 0 : fansNum;
     }
 
     public void setFansNum(Integer fansNum) {
@@ -47,7 +47,7 @@ public class TeacherTotalVo {
     }
 
     public Integer getExpTime() {
-        return expTime;
+        return null == expTime ? 0 : expTime;
     }
 
     public void setExpTime(Integer expTime) {
@@ -55,7 +55,7 @@ public class TeacherTotalVo {
     }
 
     public Integer getUnExpTime() {
-        return unExpTime;
+        return null == unExpTime ? 0 : unExpTime;
     }
 
     public void setUnExpTime(Integer unExpTime) {
@@ -63,7 +63,7 @@ public class TeacherTotalVo {
     }
 
     public Double getStarGrade() {
-        return starGrade;
+        return null == starGrade ? 0.0 : starGrade;
     }
 
     public void setStarGrade(Double starGrade) {

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

@@ -15,26 +15,31 @@
         <result column="friday_" jdbcType="VARCHAR" property="friday"/>
         <result column="saturday_" jdbcType="VARCHAR" property="saturday"/>
         <result column="sunday_" jdbcType="VARCHAR" property="sunday"/>
+        <result column="default_flag_" property="defaultFlag"/>
         <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id_
-        , teacher_id_, free_minutes_, course_minutes_, skip_holiday_flag_, subject_price_, monday_, tuesday_, wednesday_, thursday_, friday_, saturday_, sunday_, create_time_, update_time_
+        , teacher_id_, free_minutes_, course_minutes_, skip_holiday_flag_, subject_price_,
+    monday_, tuesday_, wednesday_, thursday_, friday_, saturday_, sunday_,default_flag_,create_time_, update_time_
     </sql>
 
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.yonge.cooleshow.biz.dal.entity.TeacherFreeTime">
         insert into teacher_free_time(teacher_id_, free_minutes_, course_minutes_, skip_holiday_flag_, subject_price_,
-        monday_, tuesday_, wednesday_, thursday_, friday_, saturday_, sunday_, create_time_, update_time_)
+        monday_, tuesday_, wednesday_, thursday_, friday_, saturday_, sunday_,default_flag_, create_time_, update_time_)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.teacherId}, #{entity.freeMinutes}, #{entity.courseMinutes}, #{entity.skipHolidayFlag},
             #{entity.subjectPrice}, #{entity.monday}, #{entity.tuesday}, #{entity.wednesday}, #{entity.thursday},
-            #{entity.friday}, #{entity.saturday}, #{entity.sunday}, #{entity.createTime}, #{entity.updateTime})
+            #{entity.friday}, #{entity.saturday}, #{entity.sunday}, #{entity.defaultFlag},NOW(),NOW())
         </foreach>
     </insert>
+    <update id="updateDefaultFlag">
+        UPDATE teacher_free_time SET default_flag_ = #{defaultFlag} WHERE teacher_id_ = #{teacherId}
+    </update>
     <select id="findOne" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List"/>
         FROM teacher_free_time WHERE teacher_id_ = #{teacherId}

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

@@ -3,15 +3,8 @@ package com.yonge.cooleshow.teacher.controller;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
-import com.yonge.cooleshow.biz.dal.entity.Teacher;
-import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
-import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
-import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
-import com.yonge.cooleshow.biz.dal.service.TeacherAuthMusicianRecordService;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
-import com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo;
-import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
@@ -31,13 +24,11 @@ import java.util.List;
 public class TeacherController extends BaseController {
     @Autowired
     private TeacherService teacherService;
-    @Autowired
-    private TeacherAuthEntryRecordService entryRecordService;
-    @Autowired
-    private TeacherAuthMusicianRecordService musicianRecordService;
+
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
+
     @ApiOperation(value = "我的-查询教师基本信息")
     @GetMapping("/queryUserInfo")
     public HttpResponseResult<TeacherHomeVo> queryUserInfo() {
@@ -45,26 +36,7 @@ public class TeacherController extends BaseController {
         if (user == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        Teacher teacher = teacherService.getById(user.getId());
-		TeacherHomeVo teacherHomeVo = new TeacherHomeVo();
-        teacherHomeVo.setUserId(user.getId());
-		teacherHomeVo.setHeardUrl(user.getAvatar());
-		teacherHomeVo.setUsername(user.getUsername());
-
-        TeacherAuthEntryRecord entryRecord = entryRecordService.getLastRecordByUserId(user.getId());
-        teacherHomeVo.setEntryStatus(entryRecord.getTeacherAuthStatus());
-
-        TeacherAuthMusicianRecord musicianRecord = musicianRecordService.getLastRecordByUserId(user.getId());
-        teacherHomeVo.setMusicianAuthStatus(musicianRecord.getTeacherAuthStatus());
-        teacherHomeVo.setLiveFlag(teacher.getLiveFlag());
-
-		//todo 老师授课信息
-		teacherHomeVo.setStarGrade(1);
-		teacherHomeVo.setFansNum(1);
-		teacherHomeVo.setExpTime(1);
-		teacherHomeVo.setUnExpTime(1);
-
-		return succeed(teacherHomeVo);
+        return teacherService.queryUserInfo(user);
     }
 
     @ApiOperation(value = "开通直播")