注销调整:注销后，手机号限定时间内不允许再次注册;

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

@@ -129,6 +129,11 @@ public class AdamLoginController {
         }
 
         AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
+        if (null == userInfoVo) {
+            log.warn("Cancelled mobile:{}", mobile);
+            return ResponseDto.failure(ErrorMapping.get("10024"));
+        }
+
         String passwdMd5 = DigestUtils.md5DigestAsHex(password.toLowerCase().concat(passwdSalt).getBytes(StandardCharsets.UTF_8));
         if (!passwdMd5.equals(userInfoVo.getPasswd())) {// 密码校验
             return ResponseDto.failure(ErrorMapping.get("10013"));
@@ -164,6 +169,11 @@ public class AdamLoginController {
 
         AdamUserInfoVo userInfoVo = toRegister ? adamUserService.register(mobile) : adamRdmService.getUserInfoVoByUid(uid);
 
+        if (!toRegister && null == userInfoVo) {
+            log.warn("Cancelled mobile:{}", mobile);
+            return ResponseDto.failure(ErrorMapping.get("10024"));
+        }
+
         if (0 == userInfoVo.getIsComplete() && null != skip && 1 == skip) {
             // 根据skip值，设置IsComplete（考虑到已存在用户未完善信息的情况，这里只对返回数据单独设置IsComplete）
             userInfoVo.setIsComplete(1);
@@ -196,6 +206,11 @@ public class AdamLoginController {
 
         AdamUserInfoVo userInfoVo = toRegister ? adamUserService.register(mobile) : adamRdmService.getUserInfoVoByUid(uid);
 
+        if (!toRegister && null == userInfoVo) {
+            log.warn("Cancelled mobile:{}", mobile);
+            return ResponseDto.failure(ErrorMapping.get("10024"));
+        }
+
         AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
         loginInfoVo.setUserInfo(userInfoVo);
@@ -269,7 +284,13 @@ public class AdamLoginController {
             String uid = adamRdmService.getUidByPlatformOpenId(parameter.getPlatform(), parameter.getOpenId());
             if (StringUtils.isEmpty(uid)) return ResponseDto.failure(ErrorMapping.get("10006"));
 
-            loginInfoVo.setUserInfo(adamRdmService.getUserInfoVoByUid(uid));
+            AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
+            if (null == userInfoVo) {
+                log.warn("Cancelled openId:{}", parameter.getOpenId());
+                return ResponseDto.failure(ErrorMapping.get("10024"));
+            }
+
+            loginInfoVo.setUserInfo(userInfoVo);
             loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(uid));
         } else {// 新账号注册
             ResponseDto<AdamLoginInfoVo> checkSmsCodeDto = this.checkSmsCode(parameter.getMobile(), parameter.getCode());

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

@@ -114,7 +114,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
         LinkedList<Object[]> initUserObjs = CollectionUtil.linkedListObjectArr(),
                 initUserInfoObjs = CollectionUtil.linkedListObjectArr(),
                 initThirdPartObjs = CollectionUtil.linkedListObjectArr();
-        if (StringUtils.isEmpty(uid)) {// 手机号未注册
+        if (StringUtils.isEmpty(uid)) {// 不存在UID，手机号未注册
             userInfoVo = AdamUserInfoVo.getNew();
 
             userInfoVo.setUid(IDGenerator.nextSnowId() + "");
@@ -154,12 +154,16 @@ public class AdamUserServiceImpl implements IAdamUserService {
             );
             log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
 
-        } else {// 手机号已注册
+        } else {// 存在UID，手机号已注册
             // 判断已注册用户是否绑定同平台的第三方账号
             AdamThirdPartInfoVo thirdPartVo = adamRdmService.getThirdPartVoByUidPlatform(uid, param.getPlatform());
             if (null == thirdPartVo) {// 未绑定
-                this.bindTpa(uid, param);
                 userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
+                if (null == userInfoVo) {
+                    log.warn("Cancelled mobile:{}", param.getMobile());
+                    return ResponseDto.failure(ErrorMapping.get("10024"));
+                }
+                this.bindTpa(uid, param);
             } else if (thirdPartVo.getOpenId().equals(param.getOpenId())) {
                 userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
             } else {
@@ -273,9 +277,9 @@ public class AdamUserServiceImpl implements IAdamUserService {
                 objsAddresses = CollectionUtil.linkedListObjectArr();
 
         long s = System.currentTimeMillis();
-        AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
-
-        adamRdmService.delUidByMobile(userInfoVo.getMobile());
+//        AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
+//
+//        adamRdmService.delUidByMobile(userInfoVo.getMobile());
         List<AdamThirdPartInfoVo> thirdPartInfoVos = adamRdmService.getThirdPartVoListByUid(uid);
         if (!CollectionUtils.isEmpty(thirdPartInfoVos)) {
             thirdPartInfoVos.forEach(r -> {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -27,6 +27,7 @@
 10021=签名不合规
 10022=头像不合规
 10023=背景图不合规
+10024=该账号已被主动注销
 
 
 10101=姓名或身份证件号无效

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties

 adam_user.add=INSERT INTO adam_user (`uid`, mobile, `state`, is_complete, created_at) VALUES (?,?,?,?,?) 
 adam_user.complete=UPDATE adam_user SET is_complete=?, updated_at=? WHERE `uid`=? 
 adam_user.edit.mobile=UPDATE adam_user SET mobile=?, updated_at=? WHERE `uid`=? 
-adam_user.close=UPDATE adam_user SET `state`=2, mobile=concat(mobile,'_',curtime()), updated_at=?, closed_at=? WHERE `uid`=? 
+#adam_user.close=UPDATE adam_user SET `state`=2, mobile=concat(mobile,'_',curtime()), updated_at=?, closed_at=? WHERE `uid`=?
+adam_user.close=UPDATE adam_user SET `state`=2, updated_at=?, closed_at=? WHERE `uid`=? 
 
 # ----------------------------------------------------
 adam_user_info.add=INSERT INTO adam_user_info (`uid`, nickname, avatar, qr_code) VALUES (?,?,?,?)