fix:绑定多个同类型第三方账号；

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamThirdPartyService.java

@@ -18,5 +18,5 @@ public interface IAdamThirdPartyService extends IService<AdamThirdParty> {
 
     List<AdamThirdPartInfoVo> queryByUid(String uid);
 
-    AdamThirdPartInfoVo queryByOpenId(String openId, String platform);
+    AdamThirdPartInfoVo queryByUidAndPlatform(String uid, String platform);
 }

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

@@ -12,6 +12,7 @@ public class AdamRedisConst {
     public static final String INFO_USER = ADAM.concat(":list:user");
     public static final String INFO_REAL_NAME = ADAM.concat(":list:real_name");
     public static final String INFO_THIRD_PARTY = ADAM.concat(":list:third_party");
+
     public static final String INFO_ENTERS = ADAM.concat(":list:enters:");
     public static final String INFO_ADDRESSES = ADAM.concat(":list:addresses:");
 

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

@@ -13,6 +13,7 @@ import com.liquidnet.service.adam.service.IAdamRealNameService;
 import com.liquidnet.service.adam.service.IAdamThirdPartyService;
 import com.liquidnet.service.adam.service.IAdamUserInfoService;
 import com.liquidnet.service.adam.service.IAdamUserService;
+import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -25,7 +26,6 @@ import org.springframework.core.env.Environment;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDateTime;
 import java.util.*;
 
 @ApiSupport(order = 10020)
@@ -107,19 +107,6 @@ public class AdamUserController {
         tagSexVoList.add(AdamTagVo.getNew().setVal("MS09").setDesc("不确定性别"));
         tagSexVoList.add(AdamTagVo.getNew().setVal("MS10").setDesc("不在乎性别"));
         return ResponseDto.success(tagSexVoList);
-//        Map<String, String> tagSexVos = new HashMap<>();
-//        tagSexVos.put("MS00", "其他性别");
-//        tagSexVos.put("MS01", "男性");
-//        tagSexVos.put("MS02", "女性");
-//        tagSexVos.put("MS03", "跨性别女性");
-//        tagSexVos.put("MS04", "跨性别男性");
-//        tagSexVos.put("MS05", "双性别者");
-//        tagSexVos.put("MS06", "性别模糊");
-//        tagSexVos.put("MS07", "性别流动");
-//        tagSexVos.put("MS08", "无性别者");
-//        tagSexVos.put("MS09", "不确定性别");
-//        tagSexVos.put("MS10", "不在乎性别");
-//        return ResponseDto.success(tagSexVos);
     }
 
     @ApiOperationSupport(order = 4)
@@ -133,7 +120,7 @@ public class AdamUserController {
         // TODO: 2021/5/10
         log.info("mobile:{},code:{}", mobile, code);
 
-        if (!this.checkSmsCode(mobile, code)) return ResponseDto.failure("验证码无效");
+        if (!this.checkSmsCode(mobile, code)) return ResponseDto.failure(ErrorMapping.get("10002"));
 
         String uid = CurrentUtil.getCurrentUid();
 
@@ -192,8 +179,13 @@ public class AdamUserController {
             if (null != force && force) {// 强制解绑，并重新绑定当前账号
                 return ResponseDto.success(adamUserService.bindTpaForce(currentUid, existUid, parameter));
             }
-            return ResponseDto.failure("第三方账号已绑定其它手机号");
+            return ResponseDto.failure(ErrorMapping.get("10007"));
         }
+
+        // 判断该用户是否已绑定同类型第三方账号
+        AdamThirdPartInfoVo bindThirdPartVo = adamThirdPartyService.queryByUidAndPlatform(currentUid, parameter.getPlatform());
+        if (null != bindThirdPartVo) return ResponseDto.failure(ErrorMapping.get("10008"));
+
         adamUserService.bindTpa(currentUid, parameter);
         return ResponseDto.success(adamThirdPartyService.queryByUid(currentUid));
     }

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

@@ -43,10 +43,15 @@ public class AdamThirdPartyServiceImpl extends ServiceImpl<AdamThirdPartyMapper,
         return thirdPartInfoVos;
     }
 
-    @Override
-    public AdamThirdPartInfoVo queryByOpenId(String openId, String platform) {
-        return mongoTemplate.findOne(Query.query(Criteria.where("openId").is(openId)
-                        .and("platform").is(platform).and("state").is(1)),
-                AdamThirdPartInfoVo.class, AdamThirdPartInfoVo.class.getSimpleName());
+    public AdamThirdPartInfoVo queryByUidAndPlatform(String uid, String platform) {
+        List<AdamThirdPartInfoVo> voList = this.queryByUid(uid);
+        if (!CollectionUtils.isEmpty(voList)) {
+            for (AdamThirdPartInfoVo vo : voList) {
+                if (platform.equals(vo.getPlatform())) {
+                    return vo;
+                }
+            }
+        }
+        return null;
     }
 }

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

@@ -4,7 +4,8 @@
 10004=
 10005=手机号获取失败，请更换登录方式
 10006=第三方账号未注册
-10007=
+10007=第三方账号已绑定其它账号
+10008=已绑定同类型第三方账号
 
 
 10101=