From 4a7fa07cefb891cf3294a33684fe781bc7d1d89b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:26:43 +0800
Subject: [PATCH] 调查问卷接口开发

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 6dcbf31..57b7ed7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -609,7 +609,7 @@
             //删除用户信息缓存
             String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId();
             stringRedisTemplate.delete(userKey);
-            return R.ok();
+            return R.ok(sysUserDO);
         }
         return R.fail();
     }
@@ -640,10 +640,14 @@
         //通过身份证号判断性别以及出生日期
         sysUserDO.setSex(IdCard.sex(idCard));
         sysUserDO.setBirthday(IdCard.birthDay(idCard));
-//        sysUserDO.setJob(loginUserInfoVO.getJob());
+        if(!StringUtils.isEmpty(loginUserInfoVO.getJob())){
+            sysUserDO.setJob(loginUserInfoVO.getJob());
+        }
         sysUserDO.setUserId(loginUserInfoVO.getUserId());
         sysUserDO.setFaceUrl(loginUserInfoVO.getFaceUrl());
-        sysUserDO.setPhone(loginUserInfoVO.getPhone());
+        if(!StringUtils.isEmpty(loginUserInfoVO.getPhone())){
+            sysUserDO.setPhone(loginUserInfoVO.getPhone());
+        }
         sysUserDO.setFaceState(null);
         SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard));
         if (!ObjectUtils.isEmpty(sysUserDO1)) {
@@ -670,7 +674,7 @@
                     WxXCXTempSend util = new WxXCXTempSend();
                     String accessToken = util.getAppAccessToken();
                     //用户实名认证推送消息
-                    WxUtil.sendSubscribeRZSH(user.getOpenid(),accessToken,"用户实名认证", com.panzhihua.common.utlis.DateUtils.getCurrentDateStr(),"审核通过");
+                    WxUtil.sendSubscribeRZSH(user.getOpenid(),accessToken,"实名认证", com.panzhihua.common.utlis.DateUtils.getCurrentDateStr(),"认证成功");
                 }catch (Exception e){
                     log.error("推送用户订阅消息失败,失败原因:" + e.getMessage());
                 }

--
Gitblit v1.7.1