From 947d016e4bd349b78d540e3a869f55d68b2c610c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 08 十一月 2022 18:16:18 +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 | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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 acb859c..6c33fee 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
@@ -11,6 +11,7 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -44,8 +45,7 @@
private UserService userService;
@Resource
private SysUserInputService sysUserInputService;
- @Resource
- private CommunityService communityService;
+
/**
* 新增微信用户
@@ -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();
@@ -1442,6 +1455,11 @@
@GetMapping("/communityList")
public R getCommunityList(@RequestParam("name") String name, @RequestParam(value = "id",required = false) Long id){
return userService.getCommunityList(name,id);
+ }
+
+ @GetMapping("/getAllCommunityList")
+ public R getAllCommunityList(){
+ return userService.getAllCommunityList();
}
@GetMapping("/resetPasswordAccount")
@@ -1470,6 +1488,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){
@@ -1481,5 +1507,14 @@
return userService.addComPbCheckUser(comPbCheckUserDTO);
}
+ @PostMapping("/feedBackReply")
+ public R feedBackReply(@RequestBody SysUserFeedbackVO sysUserFeedbackVO){
+ return userService.feedBackReply(sysUserFeedbackVO);
+ }
+
+ @GetMapping("/myFeedBack")
+ public R myFeedBack(@RequestParam("userId")Long id,@RequestParam(value = "type",required = false)Integer type){
+ return userService.myFeedBack(id,type);
+ }
}
--
Gitblit v1.7.1