update

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

@@ -213,6 +213,14 @@ public class Teacher implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
+	
+	@TableField(value = "is_settlement_")
+    @ApiModelProperty("是否结算")
+	private Boolean isSettlement;
+	
+	@TableField(value = "is_test_user_")
+    @ApiModelProperty("是否测试用户")
+	private Boolean isTestUser;
 
 
     public YesOrNoEnum getDegreeFlag() {
@@ -479,4 +487,20 @@ public class Teacher implements Serializable {
     public void setLockFlag(UserLockFlag lockFlag) {
         this.lockFlag = lockFlag;
     }
+
+	public Boolean getIsSettlement() {
+		return isSettlement;
+	}
+
+	public void setIsSettlement(Boolean isSettlement) {
+		this.isSettlement = isSettlement;
+	}
+
+	public Boolean getIsTestUser() {
+		return isTestUser;
+	}
+
+	public void setIsTestUser(Boolean isTestUser) {
+		this.isTestUser = isTestUser;
+	}
 }

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

@@ -32,6 +32,8 @@
         <result column="browse_" property="browse" />
         <result column="memo_" property="memo" />
         <result column="lock_flag_" property="lockFlag" />
+        <result column="is_settlement_" property="isSettlement" />
+        <result column="is_test_user_" property="isTestUser" />
         <result column="create_time_" property="createTime" />
         <result column="update_time_" property="updateTime" />
     </resultMap>
@@ -75,6 +77,8 @@
         , t.browse_ as "browse"
         , t.memo_ as "memo"
         , t.tag_ as "tag"
+        , t.is_settlement_ as "isSettlement"
+        , t.is_test_user_ as "isTestUser"
         , t.create_time_ as "createTime"
         , t.update_time_ as "updateTime"
         </sql>
@@ -258,7 +262,7 @@
 		left join sys_user u on t.user_id_ = u.id_   
 		left join teacher_total tt on tt.user_id_ = t.user_id_
 		left join (SELECT lr.speaker_id_ from live_room lr WHERE live_state_ = 1 and type_ = 'temp' group by lr.speaker_id_) a on a.speaker_id_ = t.user_id_
-		where t.entry_flag_ = 1 and find_in_set(#{subjectId},t.subject_id_)
+		where t.entry_flag_ = 1 and t.is_test_user_ = 0 and find_in_set(#{subjectId},t.subject_id_)
 		order by tt.fans_num_ desc limit 10
     </select>
 </mapper>

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

@@ -112,7 +112,7 @@
 		LEFT JOIN teacher a on t.user_id_ = a.user_id_
 		LEFT JOIN sys_user u on t.user_id_ = u.id_
 		LEFT JOIN teacher_total ta on t.user_id_ = ta.user_id_
-		where t.del_flag_ = 0 and u.del_flag_ = 0 and t.auth_status_ = 'PASS'
+		where t.del_flag_ = 0 and a.is_test_user_ = 0 and u.del_flag_ = 0 and t.auth_status_ = 'PASS'
 		<if test="param.username != null and param.username != ''">
 			AND u.username_ LIKE CONCAT('%', #{param.username}, '%')
 		</if>

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

@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiParam;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.CollectionUtils;
@@ -22,7 +21,6 @@ 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.dto.search.TeacherStyleSearch;
-import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;

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

@@ -24,14 +24,14 @@ import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetRelatedQueryInfo;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.entity.Student;
+import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-import com.yonge.cooleshow.biz.dal.service.StudentService;
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetShareVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
@@ -62,7 +62,7 @@ public class MusicSheetController extends BaseController {
     private AppVersionInfoService appVersionInfoService;
 
     @Autowired
-    private StudentService studentService;
+    private TeacherService teacherService;
 
     /**
      * 查询单条
@@ -141,12 +141,12 @@ public class MusicSheetController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        Student student = studentService.getById(sysUser.getId());
-        if (student == null) {
+        Teacher teacher = teacherService.getById(sysUser.getId());
+        if (teacher == null) {
             return failed("用户信息获取失败");
         }
         if(StringUtils.isBlank(query.getSubjectIds())){
-        	query.setSubjectIds(student.getSubjectId());
+        	query.setSubjectIds(teacher.getSubjectId());
         }
         // 老师课查看所有曲目
         if (query.getMyself() == null || query.getMyself()) {