From 8f2544f1d0e5e82c0e7ee1d89abc1c916b0b9f9f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 13:35:16 +0800
Subject: [PATCH] #feat 修改获取token

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 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 d3eb23b..d49a0f6 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
@@ -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(
@@ -1584,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);
@@ -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;
                 }

--
Gitblit v1.7.1