记得上下班打卡 | git大法好,push需谨慎

Commit 3596e60c authored by zhengfuxin's avatar zhengfuxin

修改bug

parent 459c84c5
......@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{
public static void main(String[] args) {
String[] keys = {
"smile:user1012852080372121602982063",
"smile:user1013431194887946248794794",
};
for (String key : keys) {
long value = key.hashCode();
......
......@@ -129,15 +129,10 @@ public class SmileUserController {
SmileUserVO smileUserVORedis= smileRedisUtils.getSmileUserVo(userId);
smileUserVO.setUid(userId);
if(null==smileUserVORedis){
smileUserVO.setTag("1");
}else{
if(null!=smileUserVO.getType()&&(smileUserVO.getType()==1||smileUserVO.getType()==2)){
if(null!=smileUserVORedis&&null!=smileUserVORedis.getType()&&(smileUserVORedis.getType()==1||smileUserVORedis.getType()==2)){
//说明已经验证过
return ResponseDto.failure("用户状态不对");
}
smileUserVO.setTag(smileUserVORedis.getTag().concat(",1"));
}
smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"1");
return ResponseDto.success();
}
......@@ -157,19 +152,10 @@ public class SmileUserController {
if(validate(smileUserVO.getName(),smileUserVO.getIdCard(),userId)){
smileUserVO.setUid(userId);
SmileUserVO smileUserVORedis=smileRedisUtils.getSmileUserVo(userId);
if(null==smileUserVORedis){
smileUserVORedis.setTag("2");
}else{
if(null!=smileUserVO.getType()&&(smileUserVO.getType()==1||smileUserVO.getType()==2)){
if(null!=smileUserVORedis&&null!=smileUserVORedis.getType()&&(smileUserVORedis.getType()==1||smileUserVORedis.getType()==2)){
//说明已经验证过
return ResponseDto.failure("用户状态不对");
}
if(smileUserVORedis.getTag().contains("2")){
ResponseDto.success(null);
}else{
smileUserVO.setTag(smileUserVORedis.getTag().concat(",2"));
}
}
smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"2");
}else {
return ResponseDto.failure("验证身份证失败!");
......@@ -209,18 +195,10 @@ public class SmileUserController {
String userId = CurrentUtil.getCurrentUid();
smileUserVO.setUid(userId);
SmileUserVO smileUserVORedis= smileRedisUtils.getSmileUserVo(userId);
if(null==smileUserVORedis){
smileUserVO.setTag("3");
}else{
if(null!=smileUserVO.getType()&&(smileUserVO.getType()==1||smileUserVO.getType()==2)){
if(null!=smileUserVORedis&&null!=smileUserVORedis.getType()&&(smileUserVORedis.getType()==1||smileUserVORedis.getType()==2)){
//说明已经验证过
return ResponseDto.failure("用户状态不对");
}
if(smileUserVORedis.getTag().contains("3")){
}else{
smileUserVO.setTag(smileUserVORedis.getTag().concat(",3"));
}
}
smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"3");
return ResponseDto.success();
}
......
......@@ -176,6 +176,8 @@ public class SmileFrontServiceImpl implements SmileFrontService {
redisVo.setUpdatedDate(LocalDateTime.now());
redisVo.setUid(smileUserVO.getUid());
redisVo.setDelTag(0);
redisVo.setPhone(smileUserVO.getPhone());
redisVo.setBirthday(smileUserVO.getBirthday());
// redisVo.setType(smileUserVO.getType());
}else if (type.equals("2")){
redisVo.setName(smileUserVO.getName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment