From 5fb93eaa61d42d7ebb7048057d45e285efd7f0dc Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期四, 29 九月 2022 11:05:04 +0800
Subject: [PATCH] Merge branch '20220927' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |   52 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 40 insertions(+), 12 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 de65175..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;
@@ -57,8 +58,8 @@
      */
     @PostMapping("/addOrUpdate")
     public R addOrUpdate(@RequestParam("openid") String openid, @RequestParam("sessionKey") String sessionKey,
-        @RequestParam("unionid") String unionid) {
-        return userService.updateInsertUser(openid, sessionKey, unionid);
+        @RequestParam("unionid") String unionid,@RequestParam("appId")String appId) {
+        return userService.updateInsertUser(openid, sessionKey, unionid,appId);
     }
 
     /**
@@ -1371,8 +1372,8 @@
     @GetMapping("/indexData/totalData")
     public R indexData(@RequestParam(value = "type",required = false) Integer type,
                        @RequestParam(value = "streetId",required = false) Long streetId,
-                       @RequestParam(value = "areaCode",required = false) Long areaCode){
-        return userService.newIndexData(type,streetId,areaCode);
+                       @RequestParam(value = "areaCode",required = false) Long areaCode,@RequestParam("appId")String appId){
+        return userService.newIndexData(type,streetId,areaCode,appId);
     }
 
     /**
@@ -1383,8 +1384,8 @@
     public R userRate(@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.userRate(type,streetId,areaCode,range);
+                      @RequestParam(value = "range",required = false) Integer range,@RequestParam("appId")String appId){
+        return userService.userRate(type,streetId,areaCode,range,appId);
     }
 
     /**
@@ -1395,8 +1396,8 @@
     public R realUser(@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.realUser(type,streetId,areaCode,range);
+                      @RequestParam(value = "range",required = false) Integer range,@RequestParam(value = "appId",required = false)String appId){
+        return userService.realUser(type,streetId,areaCode,range,appId);
     }
 
 
@@ -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