From 3c45bd9bf9feb6e50de3e334917f48504a940de4 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 15 十一月 2022 15:51:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
index d6b9b4d..c0d0c8e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -97,7 +97,7 @@
Boolean isExpertCheck=false;
Long expertId=null;
Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
- comEvent.setAppId(loginUserInfoVO.getAppId());
+// comEvent.setAppId(loginUserInfoVO.getAppId());
if (nonNull(comEvent.getUserType())){
if (comEvent.getUserType().equals(1)){
//个人账号权限
@@ -258,6 +258,7 @@
comEvent.setArchive(0);
comEvent.setConciliation(0);
comEvent.setChangeExpert(0);
+ comEvent.setDistribution(0);
} else if(comEvent.getEventProcessStatus().equals(2)){
//待分配和待验证状态，可以受理，分配专家
//关闭调解和归档
@@ -657,6 +658,9 @@
}
public void sendMessage(Long expertId,ComEvent comEvent){
+ if (nonNull(comEvent.getRequestUserCommunity()) && comEvent.getRequestUserCommunity().equals(10172)){
+ return;
+ }
//获取专家的openId
ComSanshuoExpert expert = comSanShuoExpertService.getById(expertId);
SysUser sysUser = sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhone, expert.getPhone()).eq(SysUser::getType, 1).eq(SysUser::getAppId,"wx0cef797390444b75" ));
@@ -1005,7 +1009,12 @@
}
}
log.info("当前userType===="+comEvent.getUserType());
- comEvent.setAppId(loginUserInfoVO.getAppId());
+ //comEvent.setAppId(loginUserInfoVO.getAppId());
+ R<LoginUserInfoVO> r = userService.detailUser(loginUserInfoVO.getUserId());
+ LoginUserInfoVO user = r.getData();
+ if (nonNull(user.getAppId())){
+ comEvent.setAppId(user.getAppId());
+ }
List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent);
ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
comEventCalculateVO.setStatus("0");
--
Gitblit v1.7.1