Merge remote-tracking branch 'origin/develop' into develop

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenTeacherController.java

@@ -9,6 +9,7 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -38,6 +39,12 @@ public class OpenTeacherController extends BaseController {
     @PostMapping("/submit")
     @ApiOperation(value = "新增", notes = "传入teacher")
     public HttpResponseResult<Boolean> submit(@Valid @RequestBody TeacherSubmitReq teacherSubmitReq) {
+
+        // 验证码不能为空
+        if (StringUtils.isBlank(teacherSubmitReq.getCode())) {
+            throw new BizException("验证码不能为空");
+        }
+
         Long tenantId = teacherSubmitReq.getTenantId();
         if (tenantId == null) {
             throw new BizException("未选择机构");

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

@@ -56,6 +56,9 @@ public class TeacherSubmitReq implements Serializable {
     @ApiModelProperty("是否解绑")
     private Boolean bindTenant;
 
+    @ApiModelProperty("邀请码验证码")
+    private String code;
+
     public Long getUserId() {
         return userId;
     }

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

@@ -60,6 +60,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.MessageFormat;
+import java.text.ParseException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -463,6 +464,13 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             if (!subjectNames.contains(student.getSubjectName())) {
                 errMsg.add(String.format("第%s行声部不支持", msgRowNo));
             }
+            try {
+                if(!StringUtils.isEmpty(student.getBirthday())){
+                    LocalDate.parse(student.getBirthday(), DateTimeFormatter.ISO_LOCAL_DATE);
+                }
+            }catch (Exception e) {
+                errMsg.add(String.format("第%s行生日格式错误", msgRowNo));
+            }
 
             if (errMsg.size() > 100) {
                 break;

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

@@ -232,6 +232,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     @Autowired
     private TenantAlbumRefMapper tenantAlbumRefMapper;
 
+    @Autowired
+    private SmsCodeService smsCodeService;
+
 
     @Autowired
     private ImGroupCoreService imGroupCoreService;
@@ -304,6 +307,14 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     @Transactional(rollbackFor = BizException.class)
     public HttpResponseResult<Boolean> submit(TeacherSubmitReq teacherSubmitReq) throws BizException {
         if (null == teacherSubmitReq.getUserId()) {
+
+            if (StringUtils.isNoneBlank(teacherSubmitReq.getPhone(), teacherSubmitReq.getCode())) {
+                // 验证手机验证码是否正确
+                if (!smsCodeService.verifyValidCode(teacherSubmitReq.getPhone(), teacherSubmitReq.getCode(),
+                        MessageTypeEnum.SMS_VERIFY_CODE_REGISTER.getCode())) {
+                    throw new BizException("验证码错误");
+                }
+            }
             //创建
             return doCreate(teacherSubmitReq);
         } else {

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

@@ -64,7 +64,7 @@
                 )
             </if>
             <if test="client.code == 'STUDENT'">
-                AND t.tenant_id_ == -1
+                AND t.tenant_id_ = -1
             </if>
         </where>
 

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

@@ -114,10 +114,8 @@ public class TeacherController extends BaseController {
             if (teacher == null) {
                 throw new BizException("老师不存在");
             }
-        } else {
-            // 新增 默认机构为操作人的机构
-            teacherSubmitReq.setTenantId(tenantInfo.getId());
         }
+        teacherSubmitReq.setTenantId(tenantInfo.getId());
         return teacherService.submit(teacherSubmitReq);
     }
 

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenTeacherController.java

@@ -9,6 +9,7 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -38,6 +39,12 @@ public class OpenTeacherController extends BaseController {
     @PostMapping("/submit")
     @ApiOperation(value = "新增", notes = "传入teacher")
     public HttpResponseResult<Boolean> submit(@Valid @RequestBody TeacherSubmitReq teacherSubmitReq) {
+
+        // 验证码不能为空
+        if (StringUtils.isBlank(teacherSubmitReq.getCode())) {
+            throw new BizException("验证码不能为空");
+        }
+
         Long tenantId = teacherSubmitReq.getTenantId();
         if (tenantId == null) {
             throw new BizException("未选择机构");