Merge branch 'jxl-vip-verifyTwoElements' into test

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

@@ -128,7 +128,15 @@ public class AdamMemberOrderController {
             if (StringUtils.isBlank(param.getName()) || StringUtils.isBlank(param.getIdCard())) {
                 return ResponseDto.failure(ErrorMapping.get("10101"));
             }
-            adamUserService.identity(currentUid, param.getName(), param.getIdCard(), (String) CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_MOBILE));
+            // 未实名：走二要素（姓名+身份证），与 identity/v2 一致
+            String boundUid = adamRdmService.getRealNameBoundUidByIdCard(param.getIdCard());
+            if (StringUtils.isNotBlank(boundUid) && !currentUid.equals(boundUid)) {
+                return ResponseDto.failure(ErrorMapping.get("10614"));
+            }
+            AdamRealInfoVo vo = adamUserService.verifyTwoElements(currentUid, param.getName(), param.getIdCard());
+            if (null == vo) {
+                return ResponseDto.failure(ErrorMapping.get("10102"));
+            }
         }
 
         return adamMemberOrderService.buyMemberOrMemberCode(currentUid, param);
@@ -247,9 +255,14 @@ public class AdamMemberOrderController {
             if (StringUtils.isBlank(param.getName()) || StringUtils.isBlank(param.getIdCard())) {
                 return ResponseDto.failure(ErrorMapping.get("10101"));
             }
-            AdamRealInfoVo vo = adamUserService.identity(currentUid, param.getName(), param.getIdCard(), (String) CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_MOBILE));
+            // 未实名：走二要素（姓名+身份证），与 identity/v2 一致
+            String boundUid = adamRdmService.getRealNameBoundUidByIdCard(param.getIdCard());
+            if (StringUtils.isNotBlank(boundUid) && !currentUid.equals(boundUid)) {
+                return ResponseDto.failure(ErrorMapping.get("10614"));
+            }
+            AdamRealInfoVo vo = adamUserService.verifyTwoElements(currentUid, param.getName(), param.getIdCard());
             if (null == vo) {
-                return ResponseDto.failure(ErrorMapping.get("10000"));
+                return ResponseDto.failure(ErrorMapping.get("10102"));
             }
         }