From b30e1a48f2bc5f65a0efd2e69e090fed2d7a627c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 15:56:43 +0800
Subject: [PATCH] #feat 订单退款和查询
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 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 8dc4c55..e76097b 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
@@ -8,6 +8,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 org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -145,7 +146,7 @@
R resetPassword(@RequestParam("userId") Long userId);
@GetMapping("/resetPasswordAccount")
- R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account);
+ R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId);
/**
* 批量重置密码用户登录密码默认admin123456
@@ -1267,11 +1268,69 @@
*/
@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);
@PostMapping("/tfLogin")
R tfLogin(@RequestBody UuLoginVO uuLoginVO);
+
+ /**
+ * 三说会堂添加后台账户
+ * */
+ @PostMapping("/sanshuoAddUser")
+ R sanShuoAddUser(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 三说会堂重置密码
+ * */
+ @GetMapping("/sanshuoResetPassword")
+ R sanShuoResetPassword(@RequestParam("account") String account,@RequestParam("pass")String password);
+
+
+ @GetMapping("/accept")
+ R accept(@RequestParam("userId")Long userId);
+
+ @PostMapping("/addComPbCheckUser")
+ R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO);
+
+
+ /**
+ * 是否为专家登陆小程序
+ * */
+ @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);
+
+ /**
+ * 获取所有社区等
+ * @return
+ */
+ @GetMapping("/getAllCommunityList")
+ R getAllCommunityList();
+
}
--
Gitblit v1.7.1