修改bug

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java

@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{
 
     public static void main(String[] args) {
         String[] keys = {
-                "smile:user:revenue:1006468249398312962255247",
+                "smile:user1012852080372121602982063",
         };
         for (String key : keys) {
             long value = key.hashCode();

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

@@ -7,7 +7,6 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.manage.SmileFrontService;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
@@ -64,7 +63,7 @@ public class SmileUserController {
     public ResponseDto<List<KylinPerformanceVo>> getPerformance() {
         return ResponseDto.success(smileFrontService.getPerformance());
     }
-    @GetMapping("repeatAuth")
+   /* @GetMapping("repeatAuth")
     @ApiOperation("重新认证")
     public ResponseDto repeatAuth() {
         String userId = CurrentUtil.getCurrentUid();
@@ -76,16 +75,32 @@ public class SmileUserController {
         smileRedisUtils.del(SmileRedisConst.SMILE_USER.concat(userId));
         smileFrontService.deleteUser(userId);
         return ResponseDto.success();
-    }
+    }*/
+  /*  @GetMapping("repeatCommit")
+    @ApiOperation("重新提交")
+    public ResponseDto repeatCommit() {
+        String userId = CurrentUtil.getCurrentUid();
+        //判断是否认证了。
+        SmileUserVO smileUserVORedis= smileRedisUtils.getSmileUserVo(userId);
+        if(null!=smileUserVORedis&&null!= smileUserVORedis.getType()&&(smileUserVORedis.getType()==2||smileUserVORedis.getType()==1)){
+            return ResponseDto.failure("该用户已认证!");
+        }
+        smileUserVORedis.setAuthStatus(0);
+        smileRedisUtils.setSmileUserVo(userId,smileUserVORedis);
+        return ResponseDto.success();
+    }*/
     @GetMapping("auth")
     @ApiOperation("认证")
     public ResponseDto auth() {
         String userId = CurrentUtil.getCurrentUid();
         SmileUserVO smileUserVORedis=  smileRedisUtils.getSmileUserVo(userId);
         if(null!=smileUserVORedis){
-            if(smileUserVORedis.getAuthStatus()==1){
+            if(smileUserVORedis.getAuthStatus()==1&&null!=smileUserVORedis.getType()&&(smileUserVORedis.getType()==1||smileUserVORedis.getType()==2)){
                 return ResponseDto.success(true);
             }else{
+                if(null!=smileUserVORedis.getType()&&smileUserVORedis.getType()==4){
+                    smileFrontService.deleteUser(userId);
+                }
                 smileUserVORedis.setAuthStatus(1);
                 smileUserVORedis.setType(0);
                 smileRedisUtils.setSmileUserVo(userId,smileUserVORedis);
@@ -115,7 +130,7 @@ public class SmileUserController {
         if(null==smileUserVORedis){
             smileUserVO.setTag("1");
         }else{
-            if(null!=smileUserVO.getType()){
+            if(null!=smileUserVO.getType()&&(smileUserVO.getType()==1||smileUserVO.getType()==2)){
                 //说明已经验证过
                 return ResponseDto.failure("用户状态不对");
             }
@@ -143,7 +158,7 @@ public class SmileUserController {
                 if(null==smileUserVORedis){
                     smileUserVORedis.setTag("2");
                 }else{
-                    if(null!=smileUserVO.getType()){
+                    if(null!=smileUserVO.getType()&&(smileUserVO.getType()==1||smileUserVO.getType()==2)){
                         //说明已经验证过
                         return ResponseDto.failure("用户状态不对");
                     }
@@ -195,7 +210,7 @@ public class SmileUserController {
         if(null==smileUserVORedis){
             smileUserVO.setTag("3");
         }else{
-            if(null!=smileUserVO.getType()){
+            if(null!=smileUserVO.getType()&&(smileUserVO.getType()==1||smileUserVO.getType()==2)){
                 //说明已经验证过
                 return ResponseDto.failure("用户状态不对");
             }

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

@@ -176,14 +176,14 @@ public class SmileFrontServiceImpl implements SmileFrontService {
             redisVo.setUpdatedDate(LocalDateTime.now());
             redisVo.setUid(smileUserVO.getUid());
             redisVo.setDelTag(0);
-            redisVo.setType(smileUserVO.getType());
+          //  redisVo.setType(smileUserVO.getType());
         }else if (type.equals("2")){
             redisVo.setName(smileUserVO.getName());
             redisVo.setIdCard(smileUserVO.getIdCard());
             redisVo.setUpdatedDate(LocalDateTime.now());
             redisVo.setUid(smileUserVO.getUid());
             redisVo.setDelTag(0);
-            redisVo.setType(smileUserVO.getType());
+            //redisVo.setType(smileUserVO.getType());
         }else if(type.equals("3")){
             redisVo.setIntroduce(smileUserVO.getIntroduce());
             redisVo.setSpecialty1(smileUserVO.getSpecialty1());
@@ -192,7 +192,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
             redisVo.setUpdatedDate(LocalDateTime.now());
             redisVo.setUid(smileUserVO.getUid());
             redisVo.setDelTag(0);
-            redisVo.setType(smileUserVO.getType());
+            //redisVo.setType(smileUserVO.getType());
         }
     }