From d340ca655a4155e0a50d10ddf932ef33a2cc7ef6 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期三, 28 九月 2022 14:53:54 +0800
Subject: [PATCH] Merge branch '20220927' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 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..4a0186f 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);
     }
 
 
@@ -1441,12 +1443,38 @@
     }
 
     @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);
     }
+
+    /**
+     * 三说会堂新增业务中心或专家账号
+     * */
+    @PostMapping("/sanshuoAddUser")
+    public R sanshuoAddUser(@RequestBody AdministratorsUserVO administratorsUserVO){
+        return userService.addExpertOrIndustryCenter(administratorsUserVO);
+    }
+
+    /**
+     * 三说会堂后台重置密码
+     * */
+    @GetMapping("/sanshuoResetPassword")
+    public R sanshuoAddUser(@RequestParam("account") String account,@RequestParam("pass")String password){
+        return userService.resetPassExpertOrIndustryCenter(account,password);
+    }
+
+    @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