opt;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java

@@ -130,10 +130,13 @@ public class AdamMemberController {
     @ApiOperation(value = "领取会员卡")
     @GetMapping("joinus")
     public ResponseDto<AdamMemberJoinusVo> joinus() {
-//        AdamMemberJoinusVo joinusVo = adamRdmService.getMemberJoinusVo(10);
-
         String currentUid = CurrentUtil.getCurrentUid();
-        AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
+
+        AdamUserInfoVo userInfoVo;
+        if (StringUtils.isEmpty(currentUid) || null == (userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid))) {
+            log.warn("###用户不存在[UID:{},TOKEN:{}]", currentUid, CurrentUtil.getToken());
+            return this.joininfo();
+        }
         final String oldQrCode = userInfoVo.getQrCode();
         if (StringUtils.startsWithIgnoreCase(oldQrCode, "lN")) {// `lN`开头即未领取，这里做领取操作
             userInfoVo.setQrCode(adamRdmService.generateMemberUniqueSerialNumber(userInfoVo.getMobile()));

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -400,6 +400,7 @@ public class AdamUserController {
 
         AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
         if (null == userInfoVo) {
+            log.warn("###用户不存在[UID:{},TOKEN:{}]", currentUid, CurrentUtil.getToken());
             return ResponseDto.success();
         }
         userProfileVo.setUserInfo(adamRdmService.ratingProvince(userInfoVo).desensitize(reviewUserInfo).rating(userMemberVo));
@@ -436,6 +437,7 @@ public class AdamUserController {
         }
         AdamUserInfoVo userInfoVo;
         if (uid == null || null == (userInfoVo = adamRdmService.getUserInfoVoByUid(uid))) {
+            log.warn("###用户不存在[MOBILE:{},UID:{},TOKEN:{}]", mobile, uid, CurrentUtil.getToken());
             return ResponseDto.failure("账号不存在，请确认");
         }
         AdamUserInfoSimpleVo vo = AdamUserInfoSimpleVo.getNew();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java

@@ -107,7 +107,9 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
         }
 
         String beforeNickname = existUserInfoVo.getNickname(), nickname = parameter.getNickname();
-        if (StringUtils.isEmpty(beforeNickname) || (StringUtils.isNotBlank(nickname) && !beforeNickname.equals(nickname))) {
+        if (isComplete == 11 && (
+                StringUtils.isEmpty(beforeNickname) || (StringUtils.isNotBlank(nickname) && !beforeNickname.equals(nickname))
+        )) {
             // IM设置推送昵称
             easemobUtil.settingNoticeNickname(nickname, existUserInfoVo.getUid());
         }