Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

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

@@ -24,6 +24,18 @@ import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.teacher.TeacherWrapper;
 import com.yonge.cooleshow.common.enums.ESettlementFrom;
 import com.yonge.cooleshow.common.enums.ETenantUnBindAuditStatus;
+<<<<<<< Updated upstream
+=======
+import com.yonge.cooleshow.common.enums.UserFirstTimeTypeEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
+import com.yonge.toolset.base.exception.BizException;
+import com.yonge.toolset.base.util.StringUtil;
+import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
+import com.yonge.toolset.thirdparty.user.realname.RealnameAuthenticationPlugin;
+import com.yonge.toolset.utils.date.DateUtil;
+import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
+import com.yonge.toolset.utils.string.ValueUtil;
+>>>>>>> Stashed changes
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
@@ -144,6 +156,15 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     private SmsCodeService smsCodeService;
 
 
+<<<<<<< Updated upstream
+=======
+    @Autowired
+    private ImGroupCoreService imGroupCoreService;
+
+    @Autowired
+    private RealnameAuthenticationPlugin realnameAuthenticationPlugin;
+
+>>>>>>> Stashed changes
     @Override
     public TeacherVo detail(Long userId) {
         TeacherVo detail = baseMapper.detail(userId);
@@ -531,13 +552,13 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             realNameAuthDto.setRealName(teacherSubmitReq.getRealName());
             realNameAuthDto.setSave(false);
 
-            HttpResponseResult<IdcardInfoExtractor> idcardInfoExtractorResult =
-                    userFeignService.realNameAuth(realNameAuthDto);
-            if (!idcardInfoExtractorResult.getStatus() || null == idcardInfoExtractorResult.getData()) {
+            if (!realnameAuthenticationPlugin.verify(realNameAuthDto.getRealName(),realNameAuthDto.getIdCardNo())) {
                 throw new BizException("实名认证未通过");
             }
+
+            //通过身份证号获取身份信息
+            IdcardInfoExtractor idcardInfo = new IdcardInfoExtractor(realNameAuthDto.getIdCardNo(), false);
             //身份证解析信息
-            IdcardInfoExtractor idcardInfo = idcardInfoExtractorResult.getData();
             sysUser.setGender(idcardInfo.getGender());
             sysUser.setBirthdate(idcardInfo.getBirthday());
             sysUser.setRealName(teacherSubmitReq.getRealName());

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()