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

.gitignore

@@ -51,4 +51,5 @@ mvnw.cmd
 .metadata
 target
 *.classpath
-/bin/
+/bin/
+**/bootstrap-local.yml

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/dto/UserSetReq.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.auth.api.dto;
 
+import com.yonge.cooleshow.common.enums.UserGenderEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -14,7 +15,7 @@ public class UserSetReq {
     @ApiModelProperty("昵称")
     private String username;
     @ApiModelProperty(value = "性别 0女 1男")
-    private Integer gender;
+    private UserGenderEnum gender;
 
     public String getAvatar() {
         return avatar;
@@ -32,11 +33,11 @@ public class UserSetReq {
         this.username = username;
     }
 
-    public Integer getGender() {
+    public UserGenderEnum getGender() {
         return gender;
     }
 
-    public void setGender(Integer gender) {
+    public void setGender(UserGenderEnum gender) {
         this.gender = gender;
     }
 }

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysMenu.java

@@ -63,7 +63,7 @@ public class SysMenu {
 
 	/** 逻辑删除标记(0--正常 1--删除) */
 	@ApiModelProperty(value = "逻辑删除标记(0--正常 1--删除)",required = false)
-	private String delFlag;
+	private Boolean delFlag;
 
 	private Integer hid;
 	
@@ -209,12 +209,12 @@ public class SysMenu {
 		return this.updateTime;
 	}
 
-	public void setDelFlag(String delFlag) {
-		this.delFlag = delFlag;
+	public Boolean getDelFlag() {
+		return delFlag;
 	}
 
-	public String getDelFlag() {
-		return this.delFlag;
+	public void setDelFlag(Boolean delFlag) {
+		this.delFlag = delFlag;
 	}
 
 	public Boolean getIsAffix() {
@@ -241,6 +241,22 @@ public class SysMenu {
 		this.linkPath = linkPath;
 	}
 
+	public Boolean getAffix() {
+		return isAffix;
+	}
+
+	public void setAffix(Boolean affix) {
+		isAffix = affix;
+	}
+
+	public Boolean getIframe() {
+		return isIframe;
+	}
+
+	public void setIframe(Boolean iframe) {
+		isIframe = iframe;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysRole.java

@@ -37,7 +37,7 @@ public class SysRole {
 	
 	/** 删除标识（0-正常,1-删除） */
 	@ApiModelProperty(value = "删除标识（0-正常,1-删除）",required = false)
-	private String delFlag;
+	private Boolean delFlag;
 
 	@ApiModelProperty(value = "菜单列表",required = false)
 	private List<Long> menuIds;
@@ -105,16 +105,24 @@ public class SysRole {
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
+
+	public Boolean getEnable() {
+		return isEnable;
 	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
+
+	public void setEnable(Boolean enable) {
+		isEnable = enable;
+	}
+
+	public Boolean getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(Boolean delFlag) {
+		this.delFlag = delFlag;
 	}
 
-    @Override
+	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUser.java

@@ -55,7 +55,7 @@ public class SysUser implements Serializable{
 
 	/** 0-正常，1-删除 */
 	@ApiModelProperty(value = "0-正常，1-删除",required = false)
-	private YesOrNoEnum delFlag;
+	private Boolean delFlag;
 
 	/** 微信openid */
 	@ApiModelProperty(value = "微信openid",required = false)
@@ -206,11 +206,11 @@ public class SysUser implements Serializable{
 		isSuperAdmin = superAdmin;
 	}
 
-	public YesOrNoEnum getDelFlag() {
+	public Boolean getDelFlag() {
 		return delFlag;
 	}
 
-	public void setDelFlag(YesOrNoEnum delFlag) {
+	public void setDelFlag(Boolean delFlag) {
 		this.delFlag = delFlag;
 	}
 

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUserDevice.java

@@ -28,7 +28,7 @@ public class SysUserDevice {
 	
 	private String clientId;
 	
-	private Integer delFlag;
+	private Boolean delFlag;
 	
 	private SysUser user;
 	
@@ -88,11 +88,11 @@ public class SysUserDevice {
 		this.clientId = clientId;
 	}
 
-	public Integer getDelFlag() {
+	public Boolean getDelFlag() {
 		return delFlag;
 	}
 
-	public void setDelFlag(Integer delFlag) {
+	public void setDelFlag(Boolean delFlag) {
 		this.delFlag = delFlag;
 	}
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserDeviceServiceImpl.java

@@ -97,7 +97,7 @@ public class SysUserDeviceServiceImpl extends BaseServiceImpl<Long, SysUserDevic
 		
 		SysUserDevice sysUserDevice = sysUserDeviceDao.get(id);
 		if(sysUserDevice != null){
-			sysUserDevice.setDelFlag(1);
+			sysUserDevice.setDelFlag(false);
 			
 			sysUserDeviceDao.update(sysUserDevice);
 		}

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -108,7 +108,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
         }
 
         user.setUpdateTime(new Date());
-        user.setDelFlag(YesOrNoEnum.YES);
+        user.setDelFlag(true);
 
         update(user);
 

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -17,7 +17,7 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="lock_flag_" property="lockFlag"/>
-        <result column="del_flag_" property="delFlag" typeHandler="com.yonge.cooleshow.common.dal.CustomEnumTypeHandler"/>
+        <result column="del_flag_" property="delFlag"/>
         <result column="wx_openid_" property="wxOpenid"/>
         <result column="qq_openid_" property="qqOpenid"/>
         <result column="user_type_" property="userType"/>

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TeacherAuthMusicianRecordController.java

@@ -31,7 +31,7 @@ public class TeacherAuthMusicianRecordController extends BaseController {
 	/**
 	 * 查询单条详情
 	 */
-	@GetMapping("/detail")
+	@GetMapping("/detail/{id}")
 	@ApiOperation(value = "详情", notes = "传入id")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),

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

@@ -26,7 +26,7 @@ public interface TeacherAuthMusicianRecordDao extends BaseMapper<TeacherAuthMusi
 	 * @updateTime 2022/3/22 19:58
 	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo>
 	 */
-	List<MusicianAuthEntryRecordVo> selectPage(IPage page, AuthEntryRecordSearch authEntryRecordSearch);
+	List<MusicianAuthEntryRecordVo> selectPage(@Param("page")IPage page,@Param("param") AuthEntryRecordSearch authEntryRecordSearch);
 
     TeacherAuthMusicianRecord getLastRecordByUserId(@Param("userId") Long userId);
 	/***

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherApplyDetailReq.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -27,7 +28,7 @@ public class TeacherApplyDetailReq implements Serializable {
     private String idCardNo;
 
     @ApiModelProperty(value = "性别（0，女  1，男）")
-    private Integer gender;
+    private GenderEnum gender;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -64,11 +65,11 @@ public class TeacherApplyDetailReq implements Serializable {
         this.userId = userId;
     }
 
-    public Integer getGender() {
+    public GenderEnum getGender() {
         return gender;
     }
 
-    public void setGender(Integer gender) {
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherSubmitReq.java

@@ -20,7 +20,7 @@ public class TeacherSubmitReq implements Serializable {
     private String username;
 
     @NotBlank(message = "手机号不能为空")
-    @ApiModelProperty(value = "手机号",required = false)
+    @ApiModelProperty(value = "手机号",required = true)
     private String phone;
 
     @NotBlank(message = "用户真实姓名不能为空")
@@ -31,8 +31,7 @@ public class TeacherSubmitReq implements Serializable {
     @ApiModelProperty(value = "用户身份证号", required = true)
     private String idCardNo;
 
-    @NotBlank(message = "老师类型不能为空")
-    @ApiModelProperty(value = "老师类型 TOURIST 游客 ENTRY 认证老师 MUSICIAN 音乐人 ", required = true)
+    @ApiModelProperty(value = "老师类型（支持多个，用逗号分隔） ENTRY 认证老师 MUSICIAN 音乐人 ")
     private String teacherType;
 
     @NotBlank(message = "专业技能不能为空")

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.support.Query;
 import io.swagger.annotations.ApiModel;
@@ -18,7 +19,7 @@ public class EmployeeSearch extends Query {
     @ApiModelProperty(value = "学院编号/昵称/电话")
     private String search;
     @ApiModelProperty(value = "性别 0女 1男")
-    private Integer gender;
+    private GenderEnum gender;
     @ApiModelProperty("学员声部 ")
     private String subjectIdList;
     @ApiModelProperty(value = "0-正常，9-锁定")
@@ -40,11 +41,11 @@ public class EmployeeSearch extends Query {
         this.search = search;
     }
 
-    public Integer getGender() {
+    public GenderEnum getGender() {
         return gender;
     }
 
-    public void setGender(Integer gender) {
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.support.Query;
 import io.swagger.annotations.ApiModel;
@@ -18,7 +19,7 @@ public class StudentSearch extends Query {
     @ApiModelProperty(value = "学员编号/昵称/电话")
     private String search;
     @ApiModelProperty(value = "性别 0女 1男")
-    private Integer gender;
+    private GenderEnum gender;
     @ApiModelProperty("学员声部 ")
     private String subjectIdList;
     @ApiModelProperty(value = "是否会员 0否 1是")
@@ -40,11 +41,11 @@ public class StudentSearch extends Query {
         this.search = search;
     }
 
-    public Integer getGender() {
+    public GenderEnum getGender() {
         return gender;
     }
 
-    public void setGender(Integer gender) {
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 

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

@@ -38,7 +38,7 @@ public class MusicTag implements Serializable {
 
 	@TableField(value = "del_flag_")
     @ApiModelProperty(value = "假删标识（0：正常，1：删除）")
-    private YesOrNoEnum delFlag;
+    private Boolean delFlag;
 
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -84,15 +84,15 @@ public class MusicTag implements Serializable {
         this.name = name;
     }
 
-	public YesOrNoEnum getDelFlag() {
+    public Boolean getDelFlag() {
         return delFlag;
     }
 
-    public void setDelFlag(YesOrNoEnum delFlag) {
+    public void setDelFlag(Boolean delFlag) {
         this.delFlag = delFlag;
     }
 
-	public Date getCreateTime() {
+    public Date getCreateTime() {
         return createTime;
     }
 

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

@@ -43,7 +43,7 @@ public class Subject {
 	
 	/**  */
 	@ApiModelProperty(value = "是否删除1是，0否",required = false)
-	private YesOrNoEnum delFlag;
+	private Boolean delFlag;
 
 	/**  */
 	@ApiModelProperty(value = "子节点列表",required = false)
@@ -113,11 +113,11 @@ public class Subject {
 		return this.updateTime;
 	}
 
-	public YesOrNoEnum getDelFlag() {
+	public Boolean getDelFlag() {
 		return delFlag;
 	}
 
-	public void setDelFlag(YesOrNoEnum delFlag) {
+	public void setDelFlag(Boolean delFlag) {
 		this.delFlag = delFlag;
 	}
 

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

@@ -51,6 +51,17 @@ public class UserOrderPayment implements Serializable {
 	@TableField(value = "pay_fail_msg_")
     private String payFailMsg;
 
+    @ApiModelProperty("创建时间 ")
+    @TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    @ApiModelProperty("更新时间 ")
+    @TableField(value = "update_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+
 	public Long getId() {
         return id;
     }
@@ -122,5 +133,20 @@ public class UserOrderPayment implements Serializable {
     public void setPayFailMsg(String payFailMsg) {
         this.payFailMsg = payFailMsg;
     }
-    
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
 }

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

@@ -0,0 +1,39 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.cooleshow.common.enums.BaseEnum;
+
+/***
+ * 性别
+ * @author liweifan
+ * @updateTime 2022/4/2 14:53
+ */
+public enum GenderEnum implements BaseEnum<Integer, GenderEnum> {
+    GIRL(0,"女"),
+    BOY(1,"男");
+    @EnumValue
+    private Integer code;
+    private String msg;
+
+    GenderEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return this.code;
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.cooleshow.common.enums.BaseEnum;
+
+/** 
+ * 会员状态枚举类
+ */
+public enum UserLockFlag implements BaseEnum<Integer, UserLockFlag> {
+
+	NORMAL(0, "正常"), LOCKED(9, "锁定"), CANCELLED(1, "冻结");
+	@EnumValue
+	private int code;
+
+	UserLockFlag(int code, String remark) {
+		this.code = code;
+		this.remark = remark;
+	}
+
+	private String remark;
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public static UserLockFlag codeOf(int code) {
+		for (UserLockFlag userStatus : UserLockFlag.values()) {
+			if (code == userStatus.getCode()) {
+				return userStatus;
+			}
+		}
+		return null;
+	}
+}

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

@@ -81,7 +81,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
     public boolean del(Long musicTagId) {
         MusicTag musicTag = new MusicTag();
         musicTag.setId(musicTagId);
-        musicTag.setDelFlag(YesOrNoEnum.YES);
+        musicTag.setDelFlag(true);
         return this.updateById(musicTag);
     }
 
@@ -112,7 +112,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
 
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         MusicTag musicTag = new MusicTag();
-        musicTag.setDelFlag(YesOrNoEnum.NO);
+        musicTag.setDelFlag(false);
         musicTag.setState(StateEnum.STOP);
         if (musicTagSaveDto.getParentTagId() == null) {
             musicTag.setParentTagId(0L);
@@ -152,7 +152,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
 
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         MusicTag musicTag = new MusicTag();
-        musicTag.setDelFlag(YesOrNoEnum.NO);
+        musicTag.setDelFlag(false);
         musicTag.setId(musicTagSaveDto.getId());
         if (musicTagSaveDto.getParentTagId() == null) {
             musicTag.setParentTagId(0L);

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

@@ -41,8 +41,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
 
     @Override
     public StudentVo detail(Long userId) {
-        StudentVo detail = baseMapper.detail(userId);
-        return detail;
+        return baseMapper.detail(userId);
     }
 
     @Override

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

@@ -46,7 +46,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
 
 	@Override
     public void upSetSubject(Subject subject) {
-        if (subject.getDelFlag() == YesOrNoEnum.YES) {
+        if (subject.getDelFlag()) {
             subjectDao.delete(subject.getId());
             return;
         }

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

@@ -78,6 +78,7 @@ public class TeacherAuthMusicianRecordServiceImpl extends ServiceImpl<TeacherAut
         TeacherAuthMusicianRecord build = baseMapper.selectById(authOperaReq.getId());
         build.setTeacherAuthStatus(authOperaReq.getPass() ? AuthStatusEnum.PASS : AuthStatusEnum.UNPASS);
         build.setReason(authOperaReq.getReason());
+        build.setVerifyUserId(sysUser.getId());
 
         //修改teacher表
         Teacher teacher = new Teacher();

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

@@ -28,6 +28,7 @@ import com.yonge.cooleshow.common.enums.UserGenderEnum;
 import com.yonge.cooleshow.common.exception.BizException;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 import com.yonge.toolset.utils.string.StringUtil;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,7 @@ import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -70,7 +72,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         List<TeacherStyleVideo> teacherStyleVideos = teacherStyleVideoService.selectListByUserId(userId);
         detail.setStyleVideo(teacherStyleVideos);
         TeacherAuthEntryRecordVo lastRecordByUserId = entryRecordService.getLastRecordByUserId(userId);
-        detail.setVerifyUser(lastRecordByUserId.getVerifyUser());
+        if (null != lastRecordByUserId) {
+            detail.setVerifyUser(lastRecordByUserId.getVerifyUser());
+        }
         return detail;
     }
 
@@ -98,16 +102,16 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             return HttpResponseResult.failed("未查询到老师信息");
         }
         TeacherHomeVo teacherHomeVo = new TeacherHomeVo();
-        teacherHomeVo.setUserId(user.getId());
-
+        try {
+            BeanUtils.copyProperties(teacherHomeVo, teacher);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         String avatar = user.getAvatar();
         if (StringUtil.isEmpty(avatar)) {
             avatar = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_TEACHER);
         }
         teacherHomeVo.setHeardUrl(avatar);
-        teacherHomeVo.setUsername(user.getUsername());
-        teacherHomeVo.setLiveFlag(teacher.getLiveFlag());
-        teacherHomeVo.setSubjectId(teacher.getSubjectId());
 
         TeacherAuthEntryRecord entryRecord = entryRecordService.getLastRecordByUserId(user.getId());
         if (null == entryRecord) {
@@ -207,7 +211,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
 
     private HttpResponseResult<Boolean> doCreate(TeacherSubmitReq teacherSubmitReq) throws BizException {
         //判断手机号
-        SysUser sysUser = employeeDao.querySysUserByPhoneAndLock(teacherSubmitReq.getPhone());
+        SysUser sysUser = employeeDao.querySysUserByPhone(teacherSubmitReq.getPhone());
         if (null != sysUser) {
             return HttpResponseResult.failed("该手机号已经被注册");
         }
@@ -232,7 +236,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
 
     private HttpResponseResult<Boolean> doUpdate(TeacherSubmitReq teacherSubmitReq) {
         //判断手机号
-        SysUser sysUser = employeeDao.querySysUserByPhoneAndLock(teacherSubmitReq.getPhone());
+        SysUser sysUser = employeeDao.querySysUserByPhone(teacherSubmitReq.getPhone());
         if (null != sysUser && !teacherSubmitReq.getUserId().equals(sysUser.getId())) {
             return HttpResponseResult.failed("该手机号已经被注册");
         }
@@ -256,14 +260,15 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
      * @updateTime 2022/3/23 17:23
      */
     private SysUser getUserDetil(SysUser sysUser, TeacherSubmitReq teacherSubmitReq) throws BizException {
-        //实名信息
-        RealnameAuthReq realNameAuthDto = new RealnameAuthReq();
-        realNameAuthDto.setIdCardNo(teacherSubmitReq.getIdCardNo());
-        realNameAuthDto.setRealName(teacherSubmitReq.getRealName());
-        realNameAuthDto.setSave(false);
+        if (!teacherSubmitReq.getIdCardNo().equals(sysUser.getIdCardNo())
+                || !teacherSubmitReq.getRealName().equals(sysUser.getRealName())) {
+
+            //实名信息
+            RealnameAuthReq realNameAuthDto = new RealnameAuthReq();
+            realNameAuthDto.setIdCardNo(teacherSubmitReq.getIdCardNo());
+            realNameAuthDto.setRealName(teacherSubmitReq.getRealName());
+            realNameAuthDto.setSave(false);
 
-        if ((!sysUser.getIdCardNo().equals(teacherSubmitReq.getIdCardNo())
-                || !sysUser.getRealName().equals(sysUser.getRealName()))) {
             HttpResponseResult<IdcardInfoExtractor> idcardInfoExtractorResult = userFeignService.realNameAuth(realNameAuthDto);
             if (!idcardInfoExtractorResult.getStatus() || null == idcardInfoExtractorResult.getData()) {
                 throw new BizException("实名认证未通过");
@@ -276,11 +281,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             sysUser.setIdCardNo(teacherSubmitReq.getIdCardNo());
         }
 
-        //插入用户表
-        sysUser = new SysUser();
-        String phone = teacherSubmitReq.getPhone();
         sysUser.setUsername(teacherSubmitReq.getUsername());
-        sysUser.setPhone(phone);
+        sysUser.setPhone(teacherSubmitReq.getPhone());
         return sysUser;
     }
 

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.entity.Student;
+import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,7 +21,7 @@ public class StudentVo extends Student {
     @ApiModelProperty("昵称")
     private String username;
     @ApiModelProperty(value = "性别 0女 1男")
-    private Integer gender;
+    private GenderEnum gender;
     @ApiModelProperty(value = "手机号")
     private String phone;
     @ApiModelProperty(value = "是否实名 0否 1是")
@@ -56,11 +57,11 @@ public class StudentVo extends Student {
         this.username = username;
     }
 
-    public Integer getGender() {
+    public GenderEnum getGender() {
         return gender;
     }
 
-    public void setGender(Integer gender) {
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 

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

@@ -18,6 +18,8 @@ import java.util.Date;
  */
 @ApiModel(value = "TeacherHomeVo对象", description = "老师主页基本信息返回")
 public class TeacherHomeVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @ApiModelProperty("对应user表用户编号")
     private Long userId;
     @ApiModelProperty("头像地址")
@@ -38,8 +40,10 @@ public class TeacherHomeVo implements Serializable {
     private AuthStatusEnum musicianAuthStatus;
     @ApiModelProperty("是否有直播权限 0 否 1 是")
     private YesOrNoEnum liveFlag;
-    @ApiModelProperty("专业技能（支持多个，用逗号分隔），对应科目表编号 ")
+    @ApiModelProperty(value = "声部id（支持多个，用逗号分隔） ")
     private String subjectId;
+    @ApiModelProperty(value = "声部名称（支持多个，用逗号分隔） ")
+    private String subjectName;
 
     public Long getUserId() {
         return userId;
@@ -128,4 +132,12 @@ public class TeacherHomeVo implements Serializable {
     public void setSubjectId(String subjectId) {
         this.subjectId = subjectId;
     }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
 }

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

@@ -11,6 +11,8 @@ import java.io.Serializable;
  */
 @ApiModel(value = "TeacherTotalVo对象", description = "老师统计信息返回")
 public class TeacherTotalVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @ApiModelProperty("对应user表用户编号")
     private Long userId;
     @ApiModelProperty("星级")

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

@@ -3,6 +3,8 @@ package com.yonge.cooleshow.biz.dal.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
+import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
+import com.yonge.cooleshow.biz.dal.enums.UserLockFlag;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,12 +19,14 @@ import java.util.List;
  */
 @ApiModel(value = "TeacherVo对象", description = "教师详情")
 public class TeacherVo extends Teacher {
+    private static final long serialVersionUID = 1L;
+
     @ApiModelProperty("头像地址")
     private String avatar;
     @ApiModelProperty("老师昵称")
     private String username;
     @ApiModelProperty(value = "性别 0女 1男")
-    private Integer gender;
+    private GenderEnum gender;
     @ApiModelProperty(value = "手机号")
     private String phone;
     @ApiModelProperty(value = "是否实名 0否 1是")
@@ -40,7 +44,7 @@ public class TeacherVo extends Teacher {
     @ApiModelProperty(value = "审核人")
     private String verifyUser;
     @ApiModelProperty(value = "0-正常，9-锁定")
-    private Integer lockFlag;
+    private UserLockFlag lockFlag;
     @ApiModelProperty(value = "声部名称（支持多个，用逗号分隔） ")
     private String subjectName;
     @ApiModelProperty(value = "老师风采视频")
@@ -62,14 +66,6 @@ public class TeacherVo extends Teacher {
         this.username = username;
     }
 
-    public Integer getGender() {
-        return gender;
-    }
-
-    public void setGender(Integer gender) {
-        this.gender = gender;
-    }
-
     public String getPhone() {
         return phone;
     }
@@ -134,14 +130,6 @@ public class TeacherVo extends Teacher {
         this.styleVideo = styleVideo;
     }
 
-    public Integer getLockFlag() {
-        return lockFlag;
-    }
-
-    public void setLockFlag(Integer lockFlag) {
-        this.lockFlag = lockFlag;
-    }
-
     public String getSubjectName() {
         return subjectName;
     }
@@ -149,4 +137,20 @@ public class TeacherVo extends Teacher {
     public void setSubjectName(String subjectName) {
         this.subjectName = subjectName;
     }
+
+    public GenderEnum getGender() {
+        return gender;
+    }
+
+    public void setGender(GenderEnum gender) {
+        this.gender = gender;
+    }
+
+    public UserLockFlag getLockFlag() {
+        return lockFlag;
+    }
+
+    public void setLockFlag(UserLockFlag lockFlag) {
+        this.lockFlag = lockFlag;
+    }
 }

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

@@ -79,7 +79,7 @@
             gender_ as gender,
             lock_flag_ as lockFlag
         FROM employee
-        left join sys_user u on t.user_id_ = u.id
+        left join sys_user u on t.user_id_ = u.id_
         <where>
             <if test="null != param.search and '' != param.search">
                 AND (

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

@@ -34,7 +34,7 @@
             u.gender_ as gender,
             u.birthdate_ as birthdate,
             u.phone_ as phone,
-            (case when isnull(u.id_card_no_) then 0 else 1 end) as isReal,
+            !isnull(u.id_card_no_) as isReal,
             u.real_name_ as realName,
             id_card_no_ as idCardNo
         FROM student t
@@ -53,7 +53,7 @@
             !isnull(birthdate_) as isReal,
             (membership_end_time_ > now()) as isVip
         FROM student t
-        left join sys_user u on t.user_id_ = u.id
+        left join sys_user u on t.user_id_ = u.id_
         <where>
             <if test="null != param.search and '' != param.search">
                 AND (

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

@@ -15,7 +15,7 @@
         <result column="desc_" property="desc"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="del_flag_" property="delFlag" typeHandler="com.yonge.cooleshow.common.dal.CustomEnumTypeHandler"/>
+        <result column="del_flag_" property="delFlag"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -107,7 +107,7 @@
             <include refid="baseColumns"/>,
             u.avatar_ as avatar,
             u.username_ as username,
-            u.gender_ as gender,
+            u.gender_ as `gender`,
             u.birthdate_ as birthdate,
             u.phone_ as phone,
             (case when isnull(u.id_card_no_) then 0 else 1 end) as isReal,
@@ -116,7 +116,7 @@
             (case when isnull(b.user_id_) then 0 else 1 end) as isBank,
             (
                 SELECT GROUP_CONCAT(name_) FROM subject WHERE FIND_IN_SET(id_,t.subject_id_)
-            ) as subjectName,
+            ) as subjectName
         FROM teacher t
         left join sys_user u on t.user_id_ = u.id_
         left join (

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

@@ -11,6 +11,8 @@
 	        <result column="invalid_time_" property="invalidTime" />
 	        <result column="arrival_time_" property="arrivalTime" />
 	        <result column="pay_fail_msg_" property="payFailMsg" />
+            <result column="create_time_" property="createTime" />
+            <result column="update_time_" property="updateTime" />
 		</resultMap>  
     
     <!-- 表字段 -->
@@ -24,5 +26,7 @@
         , t.invalid_time_
         , t.arrival_time_
         , t.pay_fail_msg_
+        ,create_time_
+        ,update_time_
         </sql>
 </mapper>