Merge branch 'dev_20230202' into ponline

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.Optional;
 
 /**
  * @Author: liweifan
@@ -57,6 +58,9 @@ public class StudentSearch extends QueryInfo{
     @ApiModelProperty("用户状态")
     private String userStatus;
 
+    @ApiModelProperty("隐藏标识")
+    private Integer hideFlag;
+
     public Date getVipStartTime() {
         return vipStartTime;
     }
@@ -170,4 +174,12 @@ public class StudentSearch extends QueryInfo{
     public void setEvaluateFlag(YesOrNoEnum evaluateFlag) {
         this.evaluateFlag = evaluateFlag;
     }
+
+    public Integer getHideFlag() {
+        return Optional.ofNullable(hideFlag).orElse(0);
+    }
+
+    public void setHideFlag(Integer hideFlag) {
+        this.hideFlag = hideFlag;
+    }
 }

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

@@ -79,6 +79,10 @@ public class Student implements Serializable {
     @TableField(value = "union_id_")
     private Long unionId;
 
+    @ApiModelProperty("隐藏标识 ")
+    @TableField(value = "hide_flag_")
+    private Integer hideFlag;
+
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@@ -191,4 +195,12 @@ public class Student implements Serializable {
     public void setUnionId(Long unionId) {
         this.unionId = unionId;
     }
+
+    public Integer getHideFlag() {
+        return hideFlag;
+    }
+
+    public void setHideFlag(Integer hideFlag) {
+        this.hideFlag = hideFlag;
+    }
 }

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;
 
@@ -246,9 +248,11 @@ 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());
+                user.setUserType(ClientEnum.STUDENT.getCode());
                 sysUserMapper.insert(user);
 
                 String subjectId = null;
@@ -263,6 +267,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                 student.setUserId(user.getId());
                 student.setSubjectId(subjectId);
                 student.setUnionId(info.getUnionId());
+                student.setLockFlag(UserLockFlag.NORMAL);
+                student.setHideFlag(Optional.ofNullable(info.getLockFlag()).orElse(0));
                 save(student);
 
                 // 更新标识
@@ -271,7 +277,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);
 
@@ -308,12 +317,13 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
 
         if (Objects.nonNull(student)) {
 
-            if (Objects.isNull(student.getUnionId())) {
+            if (Optional.ofNullable(student.getUnionId()).orElse(0L) <= 0) {
 
                 // 更新学生关联Id
                 lambdaUpdate()
                         .eq(Student::getUserId, student.getUserId())
                         .set(Student::getUnionId, info.getUnionId())
+                        .set(Student::getHideFlag, 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

@@ -40,6 +40,8 @@ public class StudentWrapper {
         @ApiModelProperty("性别（0，女  1，男）")
         private Integer gender;
 
+        @ApiModelProperty("0-正常，1-锁定")
+        private Integer lockFlag;
     }
 
     @Data

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

@@ -143,6 +143,9 @@
             <if test="param.evaluateFlag != null">
                 AND t.evaluate_time_ > 0
             </if>
+            <if test="param.hideFlag != null">
+                and t.hide_flag_ = #{param.hideFlag}
+            </if>
         </where>
         order by t.create_time_ desc
     </select>