From fe3d8816882117d963c93b678573bb93f0047911 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 08 十一月 2022 16:55:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index c37d519..02702c8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1268,7 +1268,16 @@
*/
@GetMapping("/uuPush")
R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
-
+ /**
+ * 无水洗车推送
+ * @param washPhone
+ * @param phone
+ * @param washName
+ * @param orderStatus
+ * @return
+ */
+ @GetMapping("/wsPush")
+ R wsPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
@GetMapping("/communityList")
R communityList(@RequestParam("name") String name, @RequestParam("id") Long id);
@@ -1302,4 +1311,19 @@
* */
@GetMapping("/isSanShuoExpert")
R isExpert(@RequestParam("number") String number);
+
+ /**
+ * 删除用户专家权限
+ * */
+ @GetMapping("/removeExpertRole")
+ R removeExpertRole(@RequestParam(value = "phone",required = false) String phone);
+
+ /**
+ *回复反馈意见或修改返回意见的回复
+ * */
+ @PostMapping("/feedBackReply")
+ R updateFeedBack(@RequestBody SysUserFeedbackVO sysUserFeedbackVO);
+
+ @GetMapping("/myFeedBack")
+ R myFeedBack(@RequestParam("userId") Long userId,@RequestParam(value = "type",required = false)Integer type);
}
--
Gitblit v1.7.1