Merge branch 'master' into dev_member_voucher_refund

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinStationController.java

@@ -111,7 +111,8 @@ public class KylinStationController {
 
         log.info("###logout:checkUserId:{}\nssoKey:{}\ntoken:{}", checkUserId, ssoUidM5TokenKey, token);
 
-        redisUtil.set(ssoUidM5TokenKey, 0);
+//        redisUtil.set(ssoUidM5TokenKey, 0);
+        redisUtil.del(ssoUidM5TokenKey);
     }
 
     /* ------------------------------------------------------------------ */

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

@@ -41,8 +41,6 @@ public class PlatformAdamSyncController {
     SyncEntersProcessor syncEntersProcessor;
     @Autowired
     SyncMemberRelatedProcessor syncMemberRelatedProcessor;
-    @Autowired
-    SyncRdsModProcessor syncRdsModProcessor;
 
     @ModelAttribute
     public void accessExecuting(HttpServletRequest request) {
@@ -87,7 +85,6 @@ public class PlatformAdamSyncController {
                 syncMemberRelatedProcessor.dataProcessing(stp);
                 break;
             case "rds":
-                syncRdsModProcessor.dataProcessing(stp);
                 break;
             default:
                 return ResponseDto.failure(vn);

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/sync/processor/SyncAddressesProcessor.java

@@ -4,11 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
-import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
-import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamAddresses;
-import com.liquidnet.service.adam.entity.AdamRealName;
 import com.liquidnet.service.adam.mapper.AdamAddressesMapper;
 import com.liquidnet.service.platform.service.impl.adam.sync.SyncDataProcessorService;
 import lombok.extern.slf4j.Slf4j;
@@ -46,12 +44,15 @@ public class SyncAddressesProcessor extends SyncDataProcessorService {
                 for (int i = 0; i < size; i++) {
                     AdamAddresses dto = dtos.get(i);
 
-                    AdamAddressesVo vo = AdamAddressesVo.getNew().copy(dto);
-                    //log.info("vo:{}", JsonUtils.toJson(vo));
+                    AdamUserInfoVo userInfoVo = dmRdmService.getUserInfoVoByUid(dto.getUid());
+                    if (null != userInfoVo) {
+                        AdamAddressesVo vo = AdamAddressesVo.getNew().copy(dto);
+                        //log.info("vo:{}", JsonUtils.toJson(vo));
 
-                    dmRdmService.addAddressesVoByUid(dto.getUid(), dmRdmService.getAddressesVoByUid(dto.getUid()), vo);
+                        dmRdmService.addAddressesVoByUid(dto.getUid(), dmRdmService.getAddressesVoByUid(dto.getUid()), vo);
 
-                    pct++;
+                        pct++;
+                    }
                 }
             }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/sync/processor/SyncEntersProcessor.java

@@ -4,11 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
-import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
-import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
 import com.liquidnet.service.adam.entity.AdamEnters;
-import com.liquidnet.service.adam.entity.AdamRealName;
 import com.liquidnet.service.adam.mapper.AdamEntersMapper;
 import com.liquidnet.service.platform.service.impl.adam.sync.SyncDataProcessorService;
 import lombok.extern.slf4j.Slf4j;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/sync/processor/SyncRdsModProcessor.java

-package com.liquidnet.service.platform.service.impl.adam.sync.processor;
-
-import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.service.platform.service.impl.adam.sync.SyncDataProcessorService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Slf4j
-@Service
-public class SyncRdsModProcessor extends SyncDataProcessorService {
-    @Autowired
-    RedisUtil redisUtil;
-
-    @Override
-    public void dataProcessing(int stp) {
-        // TODO: 2021/8/16
-    }
-}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/sync/processor/SyncRealNameProcessor.java

@@ -4,11 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
-import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
-import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
 import com.liquidnet.service.adam.entity.AdamRealName;
-import com.liquidnet.service.adam.entity.AdamThirdParty;
 import com.liquidnet.service.adam.mapper.AdamRealNameMapper;
 import com.liquidnet.service.platform.service.impl.adam.sync.SyncDataProcessorService;
 import lombok.extern.slf4j.Slf4j;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/sync/processor/SyncThirdPartyProcessor.java

@@ -3,10 +3,9 @@ package com.liquidnet.service.platform.service.impl.adam.sync.processor;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
-import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamThirdParty;
 import com.liquidnet.service.adam.mapper.AdamThirdPartyMapper;
 import com.liquidnet.service.platform.service.impl.adam.sync.SyncDataProcessorService;
@@ -45,13 +44,16 @@ public class SyncThirdPartyProcessor extends SyncDataProcessorService {
                 for (int i = 0; i < size; i++) {
                     AdamThirdParty dto = dtos.get(i);
 
-                    AdamThirdPartInfoVo vo = AdamThirdPartInfoVo.getNew().copy(dto);
-                    //log.info("vo:{}", JsonUtils.toJson(vo));
+                    AdamUserInfoVo userInfoVo = dmRdmService.getUserInfoVoByUid(dto.getUid());
+                    if (null != userInfoVo) {
+                        AdamThirdPartInfoVo vo = AdamThirdPartInfoVo.getNew().copy(dto);
+                        //log.info("vo:{}", JsonUtils.toJson(vo));
 
-                    dmRdmService.setUidByPlatformOpenId(dto.getPlatform(), dto.getOpenId(), dto.getUid());
-                    dmRdmService.addThirdPartVoListByUid(dto.getUid(), dmRdmService.getThirdPartVoListByUid(dto.getUid()), vo);
+                        dmRdmService.setUidByPlatformOpenId(dto.getPlatform(), dto.getOpenId(), dto.getUid());
+                        dmRdmService.addThirdPartVoListByUid(dto.getUid(), dmRdmService.getThirdPartVoListByUid(dto.getUid()), vo);
 
-                    pct++;
+                        pct++;
+                    }
                 }
             }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/sync/processor/SyncUserMemberProcessor.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
-import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
-import com.liquidnet.service.adam.entity.AdamRealName;
 import com.liquidnet.service.adam.entity.AdamUserMember;
 import com.liquidnet.service.adam.mapper.AdamUserMemberMapper;
 import com.liquidnet.service.platform.service.impl.adam.sync.SyncDataProcessorService;