记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 529ea43f authored by 张国柄's avatar 张国柄
Browse files
Options

fix:用户注销遗留用户数据修复;

parent 40b19037
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 55 deletions
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java
View file @ 529ea43f
......@@ -129,7 +129,7 @@ public class AdamLoginController {
}
AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
if (null == userInfoVo) {
if (null == userInfoVo || userInfoVo.getState() == 2) {
log.warn("Cancelled mobile:{}", mobile);
return ResponseDto.failure(ErrorMapping.get("10024"));
}
......@@ -169,7 +169,7 @@ public class AdamLoginController {
AdamUserInfoVo userInfoVo = toRegister ? adamUserService.register(mobile) : adamRdmService.getUserInfoVoByUid(uid);
if (!toRegister && null == userInfoVo) {
if (!toRegister && (null == userInfoVo || userInfoVo.getState() == 2)) {
log.warn("Cancelled mobile:{}", mobile);
return ResponseDto.failure(ErrorMapping.get("10024"));
}
......@@ -206,7 +206,7 @@ public class AdamLoginController {
AdamUserInfoVo userInfoVo = toRegister ? adamUserService.register(mobile) : adamRdmService.getUserInfoVoByUid(uid);
if (!toRegister && null == userInfoVo) {
if (!toRegister && (null == userInfoVo || userInfoVo.getState() == 2)) {
log.warn("Cancelled mobile:{}", mobile);
return ResponseDto.failure(ErrorMapping.get("10024"));
}
......@@ -257,6 +257,11 @@ public class AdamLoginController {
AdamUserInfoVo userInfoVo = toRegister ? adamUserService.register(wechatMobile) : adamRdmService.getUserInfoVoByUid(uid);
if (!toRegister && (null == userInfoVo || userInfoVo.getState() == 2)) {
log.warn("Cancelled mobile:{}", wechatMobile);
return ResponseDto.failure(ErrorMapping.get("10024"));
}
// 根据skip值，设置IsComplete（考虑到已存在用户未完善信息的情况，这里只对返回数据单独设置IsComplete）
userInfoVo.setIsComplete(1);
......@@ -285,7 +290,7 @@ public class AdamLoginController {
if (StringUtils.isEmpty(uid)) return ResponseDto.failure(ErrorMapping.get("10006"));
AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
if (null == userInfoVo) {
if (null == userInfoVo || userInfoVo.getState() == 2) {
log.warn("Cancelled openId:{}", parameter.getOpenId());
return ResponseDto.failure(ErrorMapping.get("10024"));
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java
View file @ 529ea43f
......@@ -183,6 +183,10 @@ public class AdamRdmService {
return vo;
}
public void delRealInfoVoByUid(String uid) {
redisUtil.del(AdamRedisConst.INFO_REAL_NAME.concat(uid));
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | 认证失败的<ID_TYPE+ID_NO, ID_NAME> */
public boolean setCertificationJunk(int idType, String idNo, String idName) {
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java
View file @ 529ea43f
......@@ -179,7 +179,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
AdamThirdPartInfoVo thirdPartVo = adamRdmService.getThirdPartVoByUidPlatform(uid, param.getPlatform());
if (null == thirdPartVo) {// 未绑定
userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
if (null == userInfoVo) {
if (null == userInfoVo || userInfoVo.getState() == 2) {
log.warn("Cancelled mobile:{}", param.getMobile());
return ResponseDto.failure(ErrorMapping.get("10024"));
}
......@@ -301,23 +301,17 @@ public class AdamUserServiceImpl implements IAdamUserService {
objsMobileLocate = CollectionUtil.linkedListObjectArr();
long s = System.currentTimeMillis();
// AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
//
// adamRdmService.delUidByMobile(userInfoVo.getMobile());
// adamRdmService.delUserInfoVoByUid(uid);
// adamRdmService.delUserMemberVoByUid(uid);
// adamRdmService.delAddressesVoByUid(uid);
// adamRdmService.delEntersVoByUid(uid);
log.debug("##RDS耗时:{}ms", System.currentTimeMillis() - s);
/* ---------------------- 账号基础信息 */
AdamUserInfoVo userInfoVoByUid = adamRdmService.getUserInfoVoByUid(uid);
if (null != userInfoVoByUid) {
userInfoVoByUid.setState(2);
userInfoVoByUid.setUpdatedAt(now);
userInfoVoByUid.setClosedAt(now);
adamRdmService.setUserInfoVoByUid(uid, userInfoVoByUid);
}
// AdamUserInfoVo userInfoVoByUid = adamRdmService.getUserInfoVoByUid(uid);
// if (null != userInfoVoByUid) {
// userInfoVoByUid.setState(2);
// userInfoVoByUid.setUpdatedAt(now);
// userInfoVoByUid.setClosedAt(now);
// adamRdmService.setUserInfoVoByUid(uid, userInfoVoByUid);
// }
adamRdmService.delUserInfoVoByUid(uid);
toMqSqls.add(SqlMapping.get("adam_user.close"));
objsUser.add(new Object[]{now, now, uid});
......@@ -325,62 +319,67 @@ public class AdamUserServiceImpl implements IAdamUserService {
List<AdamThirdPartInfoVo> thirdPartInfoVos = adamRdmService.getThirdPartVoListByUid(uid);
if (!CollectionUtils.isEmpty(thirdPartInfoVos)) {
thirdPartInfoVos.forEach(r -> {
r.setState(2);
r.setUpdatedAt(now);
// r.setState(2);
// r.setUpdatedAt(now);
adamRdmService.delUidByPlatformOpenId(r.getPlatform(), r.getOpenId());
});
adamRdmService.setThirdPartVoListByUid(uid, thirdPartInfoVos);
// adamRdmService.setThirdPartVoListByUid(uid, thirdPartInfoVos);
adamRdmService.delThirdPartVoListByUid(uid);
}
toMqSqls.add(SqlMapping.get("adam_third_party.close"));
objsThirdPart.add(new Object[]{now, uid});
/* ---------------------- 用户会员信息 */
AdamUserMemberVo userMemberVoByUid = adamRdmService.getUserMemberVoByUid(uid);
if (null != userMemberVoByUid) {
userMemberVoByUid.setState(2);
userMemberVoByUid.setUpdatedAt(now);
adamRdmService.setUserMemberVoByUid(uid, userMemberVoByUid);
}
// AdamUserMemberVo userMemberVoByUid = adamRdmService.getUserMemberVoByUid(uid);
// if (null != userMemberVoByUid) {
// userMemberVoByUid.setState(2);
// userMemberVoByUid.setUpdatedAt(now);
//
// adamRdmService.setUserMemberVoByUid(uid, userMemberVoByUid);
// }
adamRdmService.delUserMemberVoByUid(uid);
toMqSqls.add(SqlMapping.get("adam_user_member.close"));
objsUserMember.add(new Object[]{now, uid});
/* ---------------------- 用户实名信息 */
AdamRealInfoVo realInfoVoByUid = adamRdmService.getRealInfoVoByUid(uid);
if (null != realInfoVoByUid) {
realInfoVoByUid.setState(2);
adamRdmService.setRealInfoVoByUid(uid, realInfoVoByUid);
}
// AdamRealInfoVo realInfoVoByUid = adamRdmService.getRealInfoVoByUid(uid);
// if (null != realInfoVoByUid) {
// realInfoVoByUid.setState(2);
//
// adamRdmService.setRealInfoVoByUid(uid, realInfoVoByUid);
// }
adamRdmService.delRealInfoVoByUid(uid);
toMqSqls.add(SqlMapping.get("adam_real_name.close"));
objsRealInfo.add(new Object[]{now, uid});
/* ---------------------- 收货地址信息 */
List<AdamAddressesVo> addressesVoByUid = adamRdmService.getAddressesVoByUid(uid);
if (!CollectionUtils.isEmpty(addressesVoByUid)) {
addressesVoByUid.forEach(r -> {
r.setState(2);
r.setUpdatedAt(now);
r.setDeletedAt(now);
});
adamRdmService.setAddressesVoByUid(uid, addressesVoByUid);
}
// List<AdamAddressesVo> addressesVoByUid = adamRdmService.getAddressesVoByUid(uid);
// if (!CollectionUtils.isEmpty(addressesVoByUid)) {
// addressesVoByUid.forEach(r -> {
// r.setState(2);
// r.setUpdatedAt(now);
// r.setDeletedAt(now);
// });
//
// adamRdmService.setAddressesVoByUid(uid, addressesVoByUid);
// }
adamRdmService.delAddressesVoByUid(uid);
toMqSqls.add(SqlMapping.get("adam_addresses.close"));
objsAddresses.add(new Object[]{now, now, uid});
/* ---------------------- 入场人信息 */
List<AdamEntersVo> entersVoByUid = adamRdmService.getEntersVoByUid(uid);
if (!CollectionUtils.isEmpty(entersVoByUid)) {
entersVoByUid.forEach(r -> {
r.setState(2);
r.setUpdatedAt(now);
r.setDeletedAt(now);
});
adamRdmService.setEntersVoByUid(uid, entersVoByUid);
}
// List<AdamEntersVo> entersVoByUid = adamRdmService.getEntersVoByUid(uid);
// if (!CollectionUtils.isEmpty(entersVoByUid)) {
// entersVoByUid.forEach(r -> {
// r.setState(2);
// r.setUpdatedAt(now);
// r.setDeletedAt(now);
// });
//
// adamRdmService.setEntersVoByUid(uid, entersVoByUid);
// }
adamRdmService.delEntersVoByUid(uid);
toMqSqls.add(SqlMapping.get("adam_enters.close"));
objsEnters.add(new Object[]{now, now, uid});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment