老师入驻审核修改

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

@@ -58,7 +58,6 @@ public class TeacherApplyDetailReq implements Serializable {
     private String teacherCertificate;
 
     @ApiModelProperty("老师风采视频json 格式：[{'videoUrl':'视频地址','cover':'视频封面地址'},{'videoUrl':'视频地址','cover':'视频封面地址'}] ,将单引号替换为双引号")
-    @NotBlank(message = "至少要有一个老师风采视频")
     private String styleVideoJson;
 
     public Long getUserId() {

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

@@ -59,7 +59,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
     public TeacherAuthEntryRecordVo detail(Long id) {
         TeacherAuthEntryRecordVo detail = baseMapper.detail(id);
         //查询上一次的提交
-        TeacherAuthEntryRecordVo lastDetil = baseMapper.lastDetil(id,detail.getUserId());
+        TeacherAuthEntryRecordVo lastDetil = baseMapper.lastDetil(id, detail.getUserId());
         detail.setLastDetil(lastDetil);
         return detail;
     }
@@ -111,7 +111,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
                 saveStyleVideo(styleVideoJson, build.getUserId(), sysUser.getId());
 
                 //记录达人认证时间
-                userFirstTimeService.recordTime(build.getUserId(),ClientEnum.TEACHER, UserFirstTimeTypeEnum.ENTRY);
+                userFirstTimeService.recordTime(build.getUserId(), ClientEnum.TEACHER, UserFirstTimeTypeEnum.ENTRY);
 
                 setTag(authOperaReq, build, teacher);
             }
@@ -136,8 +136,8 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
                 teacherService.setTeacherTag(build.getUserId(), TeacherTagEnum.TEACHER);
             } else if (!StringUtil.isEmpty(teacher.getTag())) {
                 teacher.setTag(Arrays.stream(teacher.getTag().split(","))
-                                     .filter(s -> !s.equals("TEACHER"))
-                                     .collect(Collectors.joining(",")));
+                        .filter(s -> !s.equals("TEACHER"))
+                        .collect(Collectors.joining(",")));
             }
         }
         if (authOperaReq.getPass()) {
@@ -145,8 +145,8 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
                 teacherService.setTeacherTag(build.getUserId(), TeacherTagEnum.DEGREE);
             } else if (!StringUtil.isEmpty(teacher.getTag())) {
                 teacher.setTag(Arrays.stream(teacher.getTag().split(","))
-                                     .filter(s -> !s.equals("DEGREE"))
-                                     .collect(Collectors.joining(",")));
+                        .filter(s -> !s.equals("DEGREE"))
+                        .collect(Collectors.joining(",")));
             }
         }
     }
@@ -174,7 +174,9 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
                 video.setEntryFlag(YesOrNoEnum.YES);
                 batchVideoList.add(video);
             }
-            teacherStyleVideoService.batchAddStyleVideo(batchVideoList);
+            if (!CollectionUtils.isEmpty(batchVideoList)) {
+                teacherStyleVideoService.batchAddStyleVideo(batchVideoList);
+            }
         }
     }
 
@@ -236,7 +238,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
 
         List<TeacherAuthEntryRecord> olds = baseMapper.selectList(Wrappers.<TeacherAuthEntryRecord>query().lambda()
                 .eq(TeacherAuthEntryRecord::getUserId, sysUser.getId()));
-        if(CollectionUtils.isEmpty(olds)){
+        if (CollectionUtils.isEmpty(olds)) {
             teacherAuthEntryRecord.setTeacherAuthType(AuthTypeEnum.ADD);
         }
         return HttpResponseResult.status(baseMapper.insert(teacherAuthEntryRecord) > 0);

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

@@ -51,11 +51,6 @@ public class TeacherAuthEntryRecordController extends BaseController {
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        String styleVideoJson = teacherApplyDetailDto.getStyleVideoJson();
-        JSONArray jsonArray = JSONObject.parseArray(styleVideoJson);
-        if(CollectionUtils.isEmpty(jsonArray)){
-            return failed("至少要有一个老师风采视频");
-        }
         //处理老师申请逻辑
         return teacherAuthEntryRecordService.doApply(teacherApplyDetailDto, user);
     }