From eb6fc0ebcfe457fc30f65e8dfb15b8b05bebda51 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 18 十月 2022 10:17:11 +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/UserService.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index 1b97ce8..1bcf0c7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -11,6 +11,7 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
@@ -902,6 +903,14 @@
R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
/**
+ * 无水洗车通知推送
+ * @param phone
+ * @param orderStatus
+ * @return
+ */
+ R wsPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
+
+ /**
* 获取城镇或村落列表
* */
R getCommunityList(String name,Long id);
@@ -912,7 +921,7 @@
* @param account
* @return
*/
- R resetPassword(Integer type,String account);
+ R resetPassword(Integer type,String account,String appId);
/**
* 天府通办登录
@@ -920,4 +929,28 @@
* @return
*/
R tfLogin(UuLoginVO uuLoginVO);
+
+ /**
+ * 三说会堂新增业务中心或专家账号
+ * */
+ R addExpertOrIndustryCenter(AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 三说会堂后台重置密码
+ * */
+ R resetPassExpertOrIndustryCenter(String account,String password);
+
+ /**
+ * 用户授权
+ * @param userId
+ * @return
+ */
+ R accept(Long userId);
+
+ R addComPbCheckUser(ComPbCheckUserDTO comPbCheckUserDTO);
+
+ /**
+ * 移除专家权限
+ * */
+ R removeExpertRole(String phone);
}
--
Gitblit v1.7.1