From 02b087d8d55a7931d87c6e39423d9362463d67c9 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 09 十月 2022 14:13:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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 74194bf..2d41cb4 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
@@ -28,6 +28,7 @@
import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsLoginUserInfoVO;
+import com.panzhihua.common.model.vos.sanshuo.ComSanshuoExpertVO;
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.*;
@@ -160,8 +161,6 @@
private SysTemplateConfigDao sysTemplateConfigDao;
@Resource
private ObjectMapper objectMapper;
- @Resource
- private CommunityService communityService;
private static final Integer ALLCOUNTY=1;
private static final Integer ALLSTREET=2;
private static final Integer ALLCOMMUNITY=3;
@@ -497,12 +496,14 @@
loginUserInfoVO.setLevel(1);
}
//是否为三说会堂专家
- R expert = communityService.isExpert(loginUserInfoVO.getPhone());
- if (R.isOk(expert)){
+ ComSanshuoExpertVO expertVO=userDao.isExpert(loginUserInfoVO.getPhone());
+ if (nonNull(expertVO)){
loginUserInfoVO.setType(13);
}
return R.ok(loginUserInfoVO);
}
+
+
/**
* 修改用户登录密码
@@ -3617,6 +3618,38 @@
}
return R.ok();
}
+
+ @Override
+ public R wsPush(String washPhone,String phone,String washName,Integer orderStatus) {
+ if(StringUtils.isNotEmpty(phone)){
+ SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,phone).eq(SysUserDO::getAppId,"wx98d62711dfbd8425").orderByDesc(SysUserDO::getCreateAt).last("limit 1"));
+ if(sysUserDO!=null&&StringUtils.isNotEmpty(sysUserDO.getOpenid())){
+ String status="";
+ String accessToken="";
+ WxXCXTempSend util = new WxXCXTempSend();
+ try {
+ accessToken = util.getWsAccessToken();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ switch (orderStatus){
+ case 3 : status="已分配车美";
+ WxUtil.sendUuWash3(sysUserDO.getOpenid(),accessToken,status,washName,washPhone,phone,"sU18zbyzxFldHAdOREaQCR5uq_uMvCKTmGtklO1xw-w");
+ break;
+ case 4 : status="车美已开始服务";
+ WxUtil.sendUuWash4(sysUserDO.getOpenid(),accessToken,status,washName,washPhone,phone,"Eft5ksvsnOQANy2uNOGY43CC3pb33eDGA_lgCEoxuiw");
+ break;
+ case 6 : status="订单确认完成";
+ WxUtil.sendUuWash6(sysUserDO.getOpenid(),accessToken,status,washName,washPhone,phone,"k1aV97H3pDNNcNcDTeZBD9jQemNDADnRE801HhTXweI");
+ break;
+ case 9 : status="订单已取消";
+ WxUtil.sendUuWash(sysUserDO.getOpenid(),accessToken,status,washName,washPhone,phone,"9_2FhQPDxZoUqmAuIZ1L1zjjYXokdNvu7A0gzKfvruI");
+ break;
+ }
+ }
+ }
+ return R.ok();
+ }
@Override
public R getCommunityList(String name,Long id) {
//区级账号名
--
Gitblit v1.7.1