Merge branch 'dev_20230202'

# Conflicts:
#	cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/StudentWrapper.java

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

@@ -31,6 +31,7 @@ import com.yonge.cooleshow.common.enums.UserLockFlag;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.utils.date.DateUtil;
 import com.yonge.toolset.utils.string.ValueUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
@@ -46,6 +47,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
@@ -250,6 +252,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                 // 自动注册创建用户
                 com.yonge.cooleshow.biz.dal.entity.SysUser user = new com.yonge.cooleshow.biz.dal.entity.SysUser();
                 user.setUsername(info.getUsername());
+                user.setAvatar("https://daya.ks3-cn-beijing.ksyun.com/202203/T1WgJaE.png");
                 user.setPhone(info.getMobile());
                 user.setLockFlag(0);
                 user.setGender(info.getGender());
@@ -271,6 +274,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                 student.setUserId(user.getId());
                 student.setSubjectId(subjectId);
                 student.setUnionId(info.getUnionId());
+                student.setLockFlag(UserLockFlag.codeOf(Optional.ofNullable(info.getLockFlag()).orElse(0)));
                 save(student);
 
                 // 更新标识
@@ -279,7 +283,10 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
 
                 com.yonge.cooleshow.biz.dal.entity.SysUser updateEntity = new com.yonge.cooleshow.biz.dal.entity.SysUser();
                 updateEntity.setId(sysUser.getId());
-                updateEntity.setDelFlag(0); // 激活帐号
+                updateEntity.setDelFlag(Optional.ofNullable(info.getLockFlag()).orElse(0)); // 激活帐号
+                if (StringUtils.isBlank(sysUser.getUsername())) {
+                    updateEntity.setUsername(info.getUsername());
+                }
                 // 激活帐号
                 sysUserMapper.updateById(updateEntity);
 
@@ -322,6 +329,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                 lambdaUpdate()
                         .eq(Student::getUserId, student.getUserId())
                         .set(Student::getUnionId, info.getUnionId())
+                        .set(Student::getLockFlag, UserLockFlag.codeOf(Optional.ofNullable(info.getLockFlag()).orElse(0)))
                         .update();
             } else {
                 studentResp.setUnionId(student.getUnionId());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/StudentWrapper.java

@@ -3,80 +3,83 @@ package com.yonge.cooleshow.biz.dal.wrapper;
 import com.yonge.cooleshow.biz.dal.entity.SysUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
-
 /**
  * 学生封装类
  * Created by Eric.Shang on 2023/1/6.
  */
 public class StudentWrapper {
 
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @ApiModel("学生帐号关联")
-    public static class UnionStudent implements Serializable {
+  @Data
+  @Builder
+  @NoArgsConstructor
+  @AllArgsConstructor
+  @ApiModel("学生帐号关联")
+  public static class UnionStudent implements Serializable {
 
-        @ApiModelProperty("帐号关联Id")
-        private Long unionId;
+    @ApiModelProperty("帐号关联Id")
+    private Long unionId;
 
-        @ApiModelProperty("授权Token")
-        private String token;
+    @ApiModelProperty("授权Token")
+    private String token;
 
-        @ApiModelProperty("联系方式")
-        private String mobile;
+    @ApiModelProperty("联系方式")
+    private String mobile;
 
-        @ApiModelProperty("声部名称")
-        private String subjectName;
+    @ApiModelProperty("声部名称")
+    private String subjectName;
 
-        @ApiModelProperty("用户名")
-        private String username;
+    @ApiModelProperty("用户名")
+    private String username;
 
-        @ApiModelProperty("性别（0，女  1，男）")
-        private Integer gender;
+    @ApiModelProperty("性别（0，女  1，男）")
+    private Integer gender;
 
-        @ApiModelProperty("是否校验token")
-        private Boolean tokenCheck;
-    }
+    @ApiModelProperty("是否校验token")
+    private Boolean tokenCheck;
 
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @ApiModel("帐号关联响应")
-    public static class UnionStudentResp implements Serializable {
+    @ApiModelProperty("0-正常，1-锁定")
+    private Integer lockFlag;
 
-        @ApiModelProperty("帐号关联Id")
-        private Long unionId;
+  }
 
-        @ApiModelProperty("联系方式")
-        private String mobile;
+  @Data
+  @Builder
+  @NoArgsConstructor
+  @AllArgsConstructor
+  @ApiModel("帐号关联响应")
+  public static class UnionStudentResp implements Serializable {
 
-        @ApiModelProperty("用户Id")
-        private Long userId;
+    @ApiModelProperty("帐号关联Id")
+    private Long unionId;
 
-        @ApiModelProperty("用户名")
-        private String username;
+    @ApiModelProperty("联系方式")
+    private String mobile;
 
-        @ApiModelProperty("更新标识")
-        private Boolean updateFlag;
+    @ApiModelProperty("用户Id")
+    private Long userId;
 
-        private SysUser sysUser;
+    @ApiModelProperty("用户名")
+    private String username;
 
-        public UnionStudentResp userId(Long userId) {
-            this.userId = userId;
-            return this;
-        }
+    @ApiModelProperty("更新标识")
+    private Boolean updateFlag;
+
+    private SysUser sysUser;
+
+    public UnionStudentResp userId(Long userId) {
+      this.userId = userId;
+      return this;
+    }
 
-        public UnionStudentResp username(String username) {
-            this.username = username;
-            return this;
-        }
+    public UnionStudentResp username(String username) {
+      this.username = username;
+      return this;
     }
+  }
 }