Merge branch 'master' into hjc_volunteers_fix_projectList

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java

@@ -117,7 +117,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
 
     @Override
     public AjaxResult updateUserStateById(String uid, Integer state) {
-        SmileUserVO smileUserVO = getSmileUserVOFromRedis(uid);
+        SmileUserVO smileUserVO = getSmileUserVO(uid);
         //修改黑名单
         smileUserMapper.updateUserStateById(uid, state);
         updateRedisSetUser(smileUserVO, uid, state);
@@ -140,8 +140,8 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
 
     @Override
     public AjaxResult updateUserCheckById(SmileUserCheckVo smileUserCheckVo) {
-        //根据uid查询redis中的用户缓存信息
-        SmileUserVO smileUserVO = getSmileUserVOFromRedis(smileUserCheckVo.getUid());
+        //根据uid查询用户信息
+        SmileUserVO smileUserVO = getSmileUserVO(smileUserCheckVo.getUid());
         if (!smileUserVO.getType().equals(0)) {
             return AjaxResult.warn("已审核");
         }
@@ -212,10 +212,11 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
                 smileOrganization.getAgentId());
     }
 
-    private SmileUserVO getSmileUserVOFromRedis(String uid) {
+    private SmileUserVO getSmileUserVO(String uid) {
         //根据uid查询用户
         LambdaQueryWrapper<SmileUser> userQueryWrapper = Wrappers.lambdaQuery(SmileUser.class);
         userQueryWrapper.eq(SmileUser::getUid, uid);
+        userQueryWrapper.eq(SmileUser::getDelTag,0);
         SmileUser smileUser = smileUserMapper.selectOne(userQueryWrapper);
         SmileUserVO smileUserVO = new SmileUserVO();
         BeanUtils.copyProperties(smileUser, smileUserVO);
@@ -264,9 +265,10 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
             smileUserVO.setErrorReason(reason);
         }
         smileUserVO.setType(4);
-        SmileUserVO redisData = smileRedisUtils.getSmileUserVO(uid);
+//        SmileUserVO redisData = smileRedisUtils.getSmileUserVO(uid);
         //存入redis中
-        smileUserVO.setAuthStatus(redisData.getAuthStatus());
+//        smileUserVO.setAuthStatus(redisData.getAuthStatus());
+        smileUserVO.setAuthStatus(0);
         smileRedisUtils.setSmileUserVO(uid, smileUserVO);
     }
 }
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileUserController.java

@@ -99,9 +99,11 @@ public class SmileUserController {
         String userId = CurrentUtil.getCurrentUid();
         SmileUserVO smileUserVORedis=  smileRedisUtils.getSmileUserVo(userId);
         if(null!=smileUserVORedis){
-            if(smileUserVORedis.getAuthStatus()==1&&null!=smileUserVORedis.getType()&&(smileUserVORedis.getType()==1||smileUserVORedis.getType()==2)){
+            if(null!=smileUserVORedis.getType()&&(smileUserVORedis.getType()==1||smileUserVORedis.getType()==2)){
                 return ResponseDto.success(true);
-            } else{
+            }else if(smileUserVORedis.getAuthStatus()==1){
+                return ResponseDto.success(true);
+            }else{
                 if(!(smileUserVORedis.getTag().contains("1")&&smileUserVORedis.getTag().contains("2")&&smileUserVORedis.getTag().contains("3"))){
                    return ResponseDto.failure("用户信息不全，请填写后提交认证");
                 }