adam:info:user:uid - 遗漏补充

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

@@ -6,11 +6,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
+import com.liquidnet.service.adam.dto.AdamUserInfoDto;
 import com.liquidnet.service.adam.dto.vo.AdamPosScanitVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.entity.AdamUserInfo;
 import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
+import com.liquidnet.service.adam.mapper.AdamUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,10 +20,10 @@ import org.springframework.stereotype.Service;
 public class PlatformAdamUserPosService extends ServiceImpl<AdamUserInfoMapper, AdamUserInfo> {
     @Autowired
     private RedisDataSourceUtil redisDataSourceUtil;
-//    @Autowired
+    //    @Autowired
 //    private AdamUserMemberMapper adamUserMemberMapper;
-//    @Autowired
-//    private AdamUserMapper adamUserMapper;
+    @Autowired
+    private AdamUserMapper adamUserMapper;
 
     public AdamPosScanitVo scanitProcess(String code) {
         LambdaQueryWrapper<AdamUserInfo> userInfoLambdaQueryWrapper = Wrappers.lambdaQuery(AdamUserInfo.class);
@@ -53,18 +55,26 @@ public class PlatformAdamUserPosService extends ServiceImpl<AdamUserInfoMapper,
 //                        AdamUserMember::getUpdatedAt
 //                );
 //                AdamUserMember userMember = adamUserMemberMapper.selectOne(userMemberLambdaQueryWrapper);
-                AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisAdamUtil.get(AdamRedisConst.INFO_USER_MEMBER.concat(userInfo.getUid()));
-                if (null == userMemberVo) {
-                    scanitVo.setStageMarker(0);
+            }else {
+                AdamUserInfoDto adamUserInfoDto = adamUserMapper.selectByUid(userInfo.getUid());
+                if (null != adamUserInfoDto) {
+                    scanitVo.setNickname(adamUserInfoDto.getNickname());
+                    scanitVo.setMobile(adamUserInfoDto.getMobile());
+                    scanitVo.setUid(adamUserInfoDto.getUid());
+                }
+            }
+            AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisAdamUtil.get(AdamRedisConst.INFO_USER_MEMBER.concat(userInfo.getUid()));
+            if (null == userMemberVo) {
+                scanitVo.setStageMarker(0);
+            } else {
+                if (userMemberVo.isActive()) {
+                    scanitVo.setStageMarker(userMemberVo.isOldMember() ? 10 : 11);
                 } else {
-                    if (userMemberVo.isActive()) {
-                        scanitVo.setStageMarker(userMemberVo.isOldMember() ? 10 : 11);
-                    } else {
-                        scanitVo.setStageMarker(2);
-                    }
+                    scanitVo.setStageMarker(2);
                 }
             }
 
+
         }
 
         return scanitVo;

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

@@ -9,6 +9,7 @@ import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
+import com.liquidnet.service.adam.dto.AdamUserInfoDto;
 import com.liquidnet.service.adam.dto.vo.AdamProPerformMarkVo;
 import com.liquidnet.service.adam.dto.vo.AdamProScanitVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
@@ -48,20 +49,25 @@ public class PlatformAdamUserProService extends ServiceImpl<AdamUserInfoMapper,
             if (null != userInfoVo) {
                 scanitVo.setNickname(userInfoVo.getNickname());
                 scanitVo.setMobile(userInfoVo.getMobile());
-
-                AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisAdamUtil.get(AdamRedisConst.INFO_USER_MEMBER.concat(uid));
-                if (null == userMemberVo) {
-                    scanitVo.setStageMarker(0);
+            } else {
+                AdamUserInfoDto adamUserInfoDto = adamUserMapper.selectByUid(userInfo.getUid());
+                if (null != adamUserInfoDto) {
+                    scanitVo.setNickname(adamUserInfoDto.getNickname());
+                    scanitVo.setMobile(adamUserInfoDto.getMobile());
+                }
+            }
+            AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisAdamUtil.get(AdamRedisConst.INFO_USER_MEMBER.concat(uid));
+            if (null == userMemberVo) {
+                scanitVo.setStageMarker(0);
+            } else {
+                if (userMemberVo.isActive()) {
+                    scanitVo.setStageMarker(userMemberVo.isOldMember() ? 10 : 11);
                 } else {
-                    if (userMemberVo.isActive()) {
-                        scanitVo.setStageMarker(userMemberVo.isOldMember() ? 10 : 11);
-                    } else {
-                        scanitVo.setStageMarker(2);
-                    }
+                    scanitVo.setStageMarker(2);
                 }
-
-                this.performanceMarkProcessing(scanitVo, uid, pid, pna);
             }
+            this.performanceMarkProcessing(scanitVo, uid, pid, pna);
+
         }
         return scanitVo;
     }
@@ -73,7 +79,8 @@ public class PlatformAdamUserProService extends ServiceImpl<AdamUserInfoMapper,
         String rk = AdamRedisConst.CACHE_USER_PERFORMANCE_MARK.concat(uid);
         String rkv = (String) redisAdamUtil.get(rk);
 
-        List<AdamProPerformMarkVo> performMarkVos = JsonUtils.fromJson(rkv, new TypeReference<List<AdamProPerformMarkVo>>() {});
+        List<AdamProPerformMarkVo> performMarkVos = JsonUtils.fromJson(rkv, new TypeReference<List<AdamProPerformMarkVo>>() {
+        });
         if (!CollectionUtils.isEmpty(performMarkVos)) {
             Optional<AdamProPerformMarkVo> optional = performMarkVos.stream().filter(vo -> vo.getPid().equals(pid)).findAny();
             if (optional.isPresent()) {