Merge branch 'txb'

tangxiaobao

2021-08-05 07ba29f8b474c102cda0e1e5549b1ca1c90ca16b

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -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());
                }