From 7a8e31ceb01c7eb27d90197ec91efdfce4bedb41 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 16 十一月 2022 18:00:39 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 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 5d7e687..48a9b80 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,9 +903,23 @@
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);
+
+ /**
+ * 获取所有城镇或村落列表
+ * @return
+ */
+ R getAllCommunityList();
/**
* 重置密码
@@ -937,4 +952,26 @@
* @return
*/
R accept(Long userId);
+
+ R addComPbCheckUser(ComPbCheckUserDTO comPbCheckUserDTO);
+
+ /**
+ * 移除专家权限
+ * */
+ R removeExpertRole(String phone);
+
+ /**
+ * 回复用户反馈
+ * */
+ R feedBackReply(SysUserFeedbackVO sysUserFeedbackVO);
+
+ /**
+ * 查看我的问题留言或者问题留言记录
+ * */
+ R myFeedBack(Long id,Integer type,Long propertyId);
+
+ /**
+ * 是否为物业公司登录
+ * */
+ R propertyCheck(String phone);
}
--
Gitblit v1.7.1