From 555f762284195c021783e496d2fcf9303533cd88 Mon Sep 17 00:00:00 2001
From: LuoTong <2232327099qq.com>
Date: 星期二, 30 七月 2024 17:58:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |   68 +++++++++++++++++++++++++++++++---
 1 files changed, 62 insertions(+), 6 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 cd8fffa..5fc82e9 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,8 @@
 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;
 import io.swagger.annotations.ApiOperation;
@@ -43,6 +45,7 @@
     private UserService userService;
     @Resource
     private SysUserInputService sysUserInputService;
+
 
     /**
      * 新增微信用户
@@ -255,6 +258,7 @@
     @PostMapping("detailuser")
     public R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId) {
         return userService.detailUser(userId);
+//        return userService.getUserInfo(userId+"");
     }
 
     /**
@@ -803,11 +807,10 @@
      */
     @PostMapping("detailusercomunity")
     public R detailUserComunity(@RequestParam("userId") Long userId) {
-        CommunityUserInfoVO communityUserInfoVO = new CommunityUserInfoVO();
-        if (userId < 100000000l) {
+        CommunityUserInfoVO communityUserInfoVO;
+        communityUserInfoVO = sysUserInputService.detailUserComunity(userId);
+        if (communityUserInfoVO==null) {
             communityUserInfoVO = userService.detailUserComunity(userId);
-        } else {
-            communityUserInfoVO = sysUserInputService.detailUserComunity(userId);
         }
         return R.ok(communityUserInfoVO);
     }
@@ -1431,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();
@@ -1439,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")
@@ -1463,7 +1484,42 @@
      * 三说会堂后台重置密码
      * */
     @GetMapping("/sanshuoResetPassword")
-    public R sanshuoAddUser(@RequestParam("id") Long userId,@RequestParam("pass")String password){
-        return userService.resetPassExpertOrIndustryCenter(userId,password);
+    public R sanshuoAddUser(@RequestParam("account") String account,@RequestParam("pass")String password){
+        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){
+        return userService.accept(userId);
+    }
+
+    @PostMapping("/addComPbCheckUser")
+    public R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO){
+        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,@RequestParam("propertyId")Long propertyId){
+        return userService.myFeedBack(id,type,propertyId);
+    }
+
+    @GetMapping("/propertyCheck")
+    public R propertyCheck(@RequestParam String phone){
+        return userService.propertyCheck(phone);
+    }
+
 }

--
Gitblit v1.7.1