java/zhihuishenqu.git

			@@ -309,7 +309,7 @@
			Boolean isIndustryOrExpertAccount=(userDao.isIndustryCenterAccount(name)>0 \|\| userDao.isExpertAccount(name)>0);
			if (1 == type) {
			sysUserDO = userDao.selectOne(
			new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type).eq(SysUserDO::getOpenid, name));
			new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, type).eq(SysUserDO::getOpenid, name).eq(SysUserDO::getAppId, appId));
			}else if(isIndustryOrExpertAccount) {
			//三说会堂行业分中心或专家后台账号登陆
			sysUserDO = userDao.selectOne(
			@@ -1001,7 +1001,7 @@
			userDao.updateComPbMemberUserId(idCard, sysUserDO.getUserId());
			}

			SysUserDO user = userDao.selectById(loginUserInfoVO.getUserId());
			/*SysUserDO user = userDao.selectById(loginUserInfoVO.getUserId());
			if (user != null) {
			// 实名认证成功推送订阅消息给用户
			try {
			@@ -1014,7 +1014,7 @@
			} catch (Exception e) {
			log.error("推送用户订阅消息失败，失败原因：" + e.getMessage());
			}
			}
			}*/
			return R.ok();
			}
			return R.fail();
			@@ -3300,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();
			}

			@@ -3630,7 +3633,7 @@
			String accessToken = "";
			WxXCXTempSend util = new WxXCXTempSend();
			try {
			accessToken = util.getAccessToken();
			accessToken = util.getAccessToken("wx118de8a734d269f0");
			} catch (Exception e) {
			e.printStackTrace();
			}
			@@ -3640,15 +3643,15 @@
			WxUtil.sendUuWash3(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "sU18zbyzxFldHAdOREaQCR5uq_uMvCKTmGtklO1xw-w");
			break;
			case 4:
			status = "车美已开始服务";
			status = "开始服务";
			WxUtil.sendUuWash4(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "Eft5ksvsnOQANy2uNOGY43CC3pb33eDGA_lgCEoxuiw");
			break;
			case 6:
			status = "订单确认完成";
			status = "订单完成";
			WxUtil.sendUuWash6(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "k1aV97H3pDNNcNcDTeZBD9jQemNDADnRE801HhTXweI");
			break;
			case 9:
			status = "订单已取消";
			status = "订单取消";
			WxUtil.sendUuWash(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "9_2FhQPDxZoUqmAuIZ1L1zjjYXokdNvu7A0gzKfvruI");
			break;
			}
			@@ -3676,15 +3679,15 @@
			WxUtil.sendWsWash3(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "sNj6m-JBvW6rOokKGDX9X3-XH1AD0GY5_X0jA9JSLwc");
			break;
			case 4:
			status = "车美已开始服务";
			status = "开始服务";
			WxUtil.sendWsWash4(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "Eft5ksvsnOQANy2uNOGY43CC3pb33eDGA_lgCEoxuiw");
			break;
			case 6:
			status = "订单确认完成";
			status = "订单完成";
			WxUtil.sendWsWash6(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "iPS8yrsGDqy76hiP8bIbxkosveoX1xTFhdusSiGp-XM");
			break;
			case 9:
			status = "订单已取消";
			status = "订单取消";
			WxUtil.sendWsWash(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "z_ysGXz9JWBc2rXuYZzVCXKJTyLf0w0WerrohuNoEng");
			break;
			}