Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-01 2cc4ff419e5ad9abdc70556146adb4af4d258af3

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

@@ -364,6 +364,13 @@
                set.add(sysRoleDO.getRoleKey());
            });
        }
        //是否为人大代表
        if (StringUtils.isNotEmpty(sysUserDO.getPhone()) && StringUtils.isNotEmpty(sysUserDO.getName())){
            int i = userDao.isDpcMember(sysUserDO.getPhone(), sysUserDO.getName());
            if (i>0){
                loginUserInfoVO.setIsDpcMember(1);
            }
        }
        return R.ok(loginUserInfoVO);
    }

@@ -3293,16 +3300,19 @@

    @Override
    public R updateUserPartyStatus(Long userId) {
        SysUserDO sysUserDO = userDao.selectById(userId);
        if (sysUserDO != null) {
            sysUserDO.setIsPartymember(1);
            int updated = userDao.updateById(sysUserDO);
            if (updated > 0) {
                // 删除用户信息缓存
                String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
                stringRedisTemplate.delete(userKey);
        List<SysUserDO> sysUserDOs = userDao.selectByUserId(userId);
        for (SysUserDO sysUserDO : sysUserDOs) {
            if (sysUserDO != null) {
                sysUserDO.setIsPartymember(1);
                int updated = userDao.updateById(sysUserDO);
                if (updated > 0) {
                    // 删除用户信息缓存
                    String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
                    stringRedisTemplate.delete(userKey);
                }
            }
        }

        return R.ok();
    }

@@ -3623,7 +3633,7 @@
                String accessToken = "";
                WxXCXTempSend util = new WxXCXTempSend();
                try {
                    accessToken = util.getAccessToken();
                    accessToken = util.getAccessToken("wx118de8a734d269f0");
                } catch (Exception e) {
                    e.printStackTrace();
                }