Merge branch 'develop'

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/TenantActivationCodeController.java

@@ -12,6 +12,7 @@ import com.yonge.cooleshow.biz.dal.service.TenantActivationCodeService;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantActivationCodeWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.EActivationCode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -52,6 +53,7 @@ public class TenantActivationCodeController extends BaseController {
         if (student == null) {
             throw new BizException("学生不存在");
         }
+        query.setSendStatus(EActivationCode.SEND);
         query.setActivationPhone(sysUser.getPhone());
         query.setTenantId(student.getTenantId());
         // 查询数据

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

@@ -153,6 +153,7 @@ public class TenantActivationCodeController extends BaseController {
         }
         boolean update = tenantActivationCodeService.lambdaUpdate()
                 .set(TenantActivationCode::getSendStatus, EActivationCode.WAIT)
+                .set(TenantActivationCode::getActivationPhone, "")
                 .eq(TenantActivationCode::getId, id)
                 .eq(TenantActivationCode::getActivationStatus, false)
                 .eq(TenantActivationCode::getSendStatus, EActivationCode.SEND)

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

@@ -270,15 +270,19 @@ public class TenantInfoController extends BaseController {
 
             // 修改用户基础信息流程
             //设置默认头像
+            com.yonge.cooleshow.biz.dal.entity.SysUser updateSysUser = new com.yonge.cooleshow.biz.dal.entity.SysUser();
+            updateSysUser.setId(user.getId());
+            // 用户昵称
+            if (StringUtils.isNotBlank(sysUser.getUsername())) {
+                updateSysUser.setUsername(sysUser.getUsername());
+            }
+            //设置默认头像
             if (StringUtils.isNotBlank(sysUser.getAvatar())) {
                 //sysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
-
-                // 更新用户头象
-                com.yonge.cooleshow.biz.dal.entity.SysUser updateSysUser = new com.yonge.cooleshow.biz.dal.entity.SysUser();
-                updateSysUser.setId(user.getId());
                 updateSysUser.setAvatar(sysUser.getAvatar());
-                sysUserMapper.updateById(updateSysUser);
             }
+            updateSysUser.setUpdateTime(LocalDateTime.now());
+            sysUserMapper.updateById(updateSysUser);
 
             // 更新机构员工头像和昵称，机构信息表中的用户昵称
             tenantStaffService.lambdaUpdate()

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

@@ -270,16 +270,20 @@ public class TenantInfoController extends BaseController {
         } else {
 
             // 修改用户基础信息流程
+            // 更新用户头象
+            com.yonge.cooleshow.biz.dal.entity.SysUser updateSysUser = new com.yonge.cooleshow.biz.dal.entity.SysUser();
+            updateSysUser.setId(user.getId());
+            // 用户昵称
+            if (StringUtils.isNotBlank(sysUser.getUsername())) {
+                updateSysUser.setUsername(sysUser.getUsername());
+            }
             //设置默认头像
             if (StringUtils.isNotBlank(sysUser.getAvatar())) {
                 //sysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
-
-                // 更新用户头象
-                com.yonge.cooleshow.biz.dal.entity.SysUser updateSysUser = new com.yonge.cooleshow.biz.dal.entity.SysUser();
-                updateSysUser.setId(user.getId());
                 updateSysUser.setAvatar(sysUser.getAvatar());
-                sysUserMapper.updateById(updateSysUser);
             }
+            updateSysUser.setUpdateTime(LocalDateTime.now());
+            sysUserMapper.updateById(updateSysUser);
 
             // 更新机构员工头像和昵称，机构信息表中的用户昵称
             tenantStaffService.lambdaUpdate()