Merge branch 'dev-caomeihuizhang' into container-test

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

@@ -340,6 +340,18 @@ public class AdamUserController {
 
         String currentUid = CurrentUtil.getCurrentUid();
 
+        // QQ 特殊场景：openId 变更时允许“无感知”替换绑定（仅限当前 uid 自己的 QQ 绑定）
+        // 先解绑当前 uid 旧的 QQ，再绑定新的 QQ openId，避免命中“已绑定同类型”限制(10008)
+        if ("QQ".equals(parameter.getPlatform())) {
+            AdamThirdPartInfoVo currentQq = adamRdmService.getThirdPartVoByUidPlatform(currentUid, parameter.getPlatform());
+            if (null != currentQq) {
+                if (parameter.getOpenId().equals(currentQq.getOpenId())) {
+                    return ResponseDto.success(adamRdmService.getThirdPartVoListByUid(currentUid));
+                }
+                adamUserService.unBindTpa(currentUid, parameter.getPlatform());
+            }
+        }
+
         String existUid = adamRdmService.getUidByPlatformOpenId(parameter.getPlatform(), parameter.getOpenId());
         if (StringUtils.isNotEmpty(existUid)) {
             if (existUid.equals(currentUid)) {