老师管理接口修改

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 = "老师类型 TOURIST 游客 ENTRY 认证老师 MUSICIAN 音乐人 ")
     private String teacherType;
 
     @NotBlank(message = "专业技能不能为空")

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

@@ -72,7 +72,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         List<TeacherStyleVideo> teacherStyleVideos = teacherStyleVideoService.selectListByUserId(userId);
         detail.setStyleVideo(teacherStyleVideos);
         TeacherAuthEntryRecordVo lastRecordByUserId = entryRecordService.getLastRecordByUserId(userId);
-        if(null != lastRecordByUserId){
+        if (null != lastRecordByUserId) {
             detail.setVerifyUser(lastRecordByUserId.getVerifyUser());
         }
         return detail;
@@ -103,7 +103,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         }
         TeacherHomeVo teacherHomeVo = new TeacherHomeVo();
         try {
-            BeanUtils.copyProperties(teacherHomeVo,teacher);
+            BeanUtils.copyProperties(teacherHomeVo, teacher);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -211,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("该手机号已经被注册");
         }
@@ -236,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("该手机号已经被注册");
         }
@@ -266,8 +266,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         realNameAuthDto.setRealName(teacherSubmitReq.getRealName());
         realNameAuthDto.setSave(false);
 
-        if ((!sysUser.getIdCardNo().equals(teacherSubmitReq.getIdCardNo())
-                || !sysUser.getRealName().equals(sysUser.getRealName()))) {
+        if (!teacherSubmitReq.getIdCardNo().equals(sysUser.getIdCardNo())
+                || !teacherSubmitReq.getRealName().equals(sysUser.getRealName())) {
             HttpResponseResult<IdcardInfoExtractor> idcardInfoExtractorResult = userFeignService.realNameAuth(realNameAuthDto);
             if (!idcardInfoExtractorResult.getStatus() || null == idcardInfoExtractorResult.getData()) {
                 throw new BizException("实名认证未通过");