Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.service;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
+import com.liquidnet.service.base.ResponseDto;
 
 /**
  * <p>
@@ -26,9 +27,9 @@ public interface IAdamUserService {
      * 第三方账号注册
      *
      * @param param
-     * @return AdamUserInfoVo
+     * @return ResponseDto<AdamUserInfoVo>
      */
-    AdamUserInfoVo register(AdamThirdPartParam param);
+    ResponseDto<AdamUserInfoVo> register(AdamThirdPartParam param);
 
     /**
      * 第三方账号绑定（不存在已绑定账号）

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -96,6 +96,8 @@ liquidnet:
       service:
         appid: wx3498304dda39c5a1
         secret: a1307fab0a5f2380086a7c636f7339ea
+        token: tftipg1427706847
+        aeskey: LwVpmpuOcl7Mi3mtfQgBol11MsmMCATIqbPgHrEpDzx
     applet:
       strawberry:
         appid: wx08b852ade69f8019

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -96,6 +96,8 @@ liquidnet:
       service:
         appid: wx3498304dda39c5a1
         secret: a1307fab0a5f2380086a7c636f7339ea
+        token: tftipg1427706847
+        aeskey: LwVpmpuOcl7Mi3mtfQgBol11MsmMCATIqbPgHrEpDzx
     applet:
       strawberry:
         appid: wx08b852ade69f8019

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

@@ -281,14 +281,16 @@ public class AdamLoginController {
             if (!checkSmsCodeDto.isSuccess()) {
                 return checkSmsCodeDto;
             }
-            AdamUserInfoVo registerUserInfo = adamUserService.register(parameter);
-            if (null == registerUserInfo) {
-                return ResponseDto.failure(ErrorMapping.get("10000"));
+            ResponseDto<AdamUserInfoVo> registerRespDto = adamUserService.register(parameter);
+            if (!registerRespDto.isSuccess()) {
+                return ResponseDto.failure(registerRespDto.getCode(), registerRespDto.getMessage());
+            } else {
+                AdamUserInfoVo registerUserInfo = registerRespDto.getData();
+                loginInfoVo.setUserInfo(registerUserInfo);
+                loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
+//                loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
             }
             toRegister = true;
-            loginInfoVo.setUserInfo(registerUserInfo);
-            loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
-//            loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         }
         loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo()));
         loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(loginInfoVo.getUserInfo().getMobile(), 3, 4));

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

@@ -197,6 +197,24 @@ public class AdamRdmService {
         return redisUtil.set(AdamRedisConst.INFO_THIRD_PARTY + uid, vos);
     }
 
+    public boolean rmvThirdPartVoListByUid(String uid, List<AdamThirdPartInfoVo> vos, String platform) {
+        if (CollectionUtils.isEmpty(vos)) {
+            return true;
+        }
+        vos.removeIf(r -> r.getPlatform().equals(platform));
+        return redisUtil.set(AdamRedisConst.INFO_THIRD_PARTY + uid, vos);
+    }
+
+    public AdamThirdPartInfoVo getThirdPartVoByUidPlatform(List<AdamThirdPartInfoVo> vos, String platform) {
+        if (!CollectionUtils.isEmpty(vos)) {
+            Optional<AdamThirdPartInfoVo> any = vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny();
+            if (any.isPresent()) {
+                return any.get();
+            }
+        }
+        return null;
+    }
+
     public AdamThirdPartInfoVo getThirdPartVoByUidPlatform(String uid, String platform) {
         List<AdamThirdPartInfoVo> vos = this.getThirdPartVoListByUid(uid);
         if (!CollectionUtils.isEmpty(vos)) {