From 84bf62e86220ec8c1f5672666f1fbaf4618f55a9 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期二, 01 十一月 2022 10:49:27 +0800 Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua --- springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 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 736b909..a403e43 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 @@ -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); } @@ -510,6 +517,13 @@ ComSanshuoExpertVO expertVO=userDao.isExpert(loginUserInfoVO.getPhone()); if (nonNull(expertVO)){ loginUserInfoVO.setType(13); + } + //是否为人大代表 + if (StringUtils.isNotEmpty(phone) && StringUtils.isNotEmpty(sysUserDO.getName())){ + int i = userDao.isDpcMember(phone, sysUserDO.getName()); + if (i>0){ + loginUserInfoVO.setIsDpcMember(1); + } } return R.ok(loginUserInfoVO); } @@ -1570,11 +1584,11 @@ || operlog.getTitle().equals(UPDATEACIDRECORD)); if (flag) { //保存数据 - try { - operlog.setBeforeUpdateData(saveBeforeUpdateData(operlog)); - } catch (JsonProcessingException e) { - e.printStackTrace(); - } +// try { +//// operlog.setBeforeUpdateData(saveBeforeUpdateData(operlog)); +// } catch (JsonProcessingException e) { +// e.printStackTrace(); +// } } SysOperLogDO sysOperLogDO = new SysOperLogDO(); BeanUtils.copyProperties(operlog, sysOperLogDO); @@ -3619,7 +3633,7 @@ String accessToken = ""; WxXCXTempSend util = new WxXCXTempSend(); try { - accessToken = util.getAccessToken(); + accessToken = util.getAccessToken("wx118de8a734d269f0"); } catch (Exception e) { e.printStackTrace(); } @@ -3629,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; } @@ -3665,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; } -- Gitblit v1.7.1