From 0425d92826ae9515f4bca39da1cd6bca066d3336 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期日, 09 十月 2022 13:55:57 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 274bd08..88ddaca 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 io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -1404,8 +1405,9 @@
public R userActivity(@RequestParam(value = "type",required = false) Integer type,
@RequestParam(value = "streetId",required = false) Long streetId,
@RequestParam(value = "areaCode",required = false) Long areaCode,
- @RequestParam(value = "range",required = false) Integer range){
- return userService.userActivity(type,streetId,areaCode,range);
+ @RequestParam(value = "range",required = false) Integer range,
+ @RequestParam(value = "appId",required = false) String appId){
+ return userService.userActivity(type,streetId,areaCode,range, appId);
}
@@ -1430,6 +1432,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();
@@ -1441,12 +1456,22 @@
}
@GetMapping("/resetPasswordAccount")
- public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account){
- return userService.resetPassword(type,account);
+ public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId){
+ return userService.resetPassword(type,account,appId);
}
@PostMapping("/tfLogin")
public R tfLogin(@RequestBody UuLoginVO uuLoginVO){
return userService.tfLogin(uuLoginVO);
}
+
+ @GetMapping("/accept")
+ public R accept(@RequestParam("userId")Long userId){
+ return userService.accept(userId);
+ }
+
+ @PostMapping("/addComPbCheckUser")
+ public R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO){
+ return userService.addComPbCheckUser(comPbCheckUserDTO);
+ }
}
--
Gitblit v1.7.1