From 5b26077c6b895dc72e7a80e6d2ddccc7b754da8e Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期日, 09 十月 2022 13:59:42 +0800
Subject: [PATCH] Merge branch '20221008' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 2eb419e..cd7ecb0 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
@@ -45,8 +45,7 @@
private UserService userService;
@Resource
private SysUserInputService sysUserInputService;
- @Resource
- private CommunityService communityService;
+
/**
* 新增微信用户
@@ -1435,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();
@@ -1471,6 +1483,7 @@
return userService.resetPassExpertOrIndustryCenter(account,password);
}
+
@GetMapping("/accept")
public R accept(@RequestParam("userId")Long userId){
return userService.accept(userId);
@@ -1481,11 +1494,5 @@
return userService.addComPbCheckUser(comPbCheckUserDTO);
}
- /**
- * 是否为专家登陆小程序
- * */
- @GetMapping("/isSanShuoExpert")
- public R isExpert(@RequestParam("number") String number){
- return communityService.isExpert(number);
- }
+
}
--
Gitblit v1.7.1