From c5e8177c3fbc27ac825f38c465383903adb87596 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 01 十一月 2022 13:59:08 +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/api/UserApi.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 1e28143..62ec37d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1434,6 +1434,19 @@
return userService.uuPush(washPhone,phone,washName,orderStatus);
}
+ /**
+ * 无水洗车推送
+ * @param washPhone
+ * @param phone
+ * @param washName
+ * @param orderStatus
+ * @return
+ */
+ @GetMapping("/wsPush")
+ public R wsPush(@RequestParam(value = "washPhone",required = false)String washPhone,@RequestParam("phone")String phone,@RequestParam(value = "washName",required = false)String washName,@RequestParam("orderStatus")Integer orderStatus){
+ return userService.wsPush(washPhone,phone,washName,orderStatus);
+ }
+
@GetMapping("/indexData/getAreaAndStreet")
public R getAreaAndStreet(){
return userService.getAreaAndStreet();
@@ -1470,6 +1483,14 @@
return userService.resetPassExpertOrIndustryCenter(account,password);
}
+ /**
+ * 移除账号专家权限
+ *
+ */
+ @GetMapping("/removeExpertRole")
+ public R removeExpertRole(@RequestParam(value = "phone",required = false)String phone){
+ return userService.removeExpertRole(phone);
+ }
@GetMapping("/accept")
public R accept(@RequestParam("userId")Long userId){
--
Gitblit v1.7.1