From 74570c3c6b01ef869824030ad110e6b930fa5e08 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期日, 26 九月 2021 16:43:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_bak' into test_bak
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 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 cacaa9b..d9494da 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
@@ -2,6 +2,8 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -125,6 +127,26 @@
*/
@PostMapping("changepassword")
R changePassword(@RequestBody ChangePasswordVO changePasswordVO);
+
+ /**
+ * 重置密码用户登录密码默认admin123456
+ *
+ * @param userId
+ * 新密码
+ * @return 修改结果
+ */
+ @GetMapping("resetPassword")
+ R resetPassword(@RequestParam("userId") Long userId);
+
+ /**
+ * 批量重置密码用户登录密码默认admin123456
+ *
+ * @param userIds
+ * 新密码
+ * @return 修改结果
+ */
+ @GetMapping("resetPasswordPatch")
+ R resetPasswordPatch(@RequestParam("userIds") Long[] userIds);
/**
* 某社区后台人员查询
@@ -310,6 +332,16 @@
*/
@PostMapping("adduserbackstage")
R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 新增社区后台物业，社会组织，业主委员会账户
+ *
+ * @param administratorsUserVO
+ * 账户信息
+ * @return 新增结果
+ */
+ @PostMapping("adduserbackstageproperty")
+ R addUserBackstageProperty(@RequestBody AdministratorsUserVO administratorsUserVO);
/**
* 编辑运营、社区后台账户
@@ -988,4 +1020,38 @@
*/
@GetMapping("getUserListByCommunityId")
R getUserListByCommunityId(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 检查当前用户是否是社区工作人员
+ * @param phone
+ * @param communityId
+ * @return
+ */
+ @GetMapping("checkIsTeam")
+ R checkCurrentUserIsTeam(@RequestParam("phone") String phone, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 便民服务新增商家账号
+ * @param convenientMerchantDTO
+ * @return 商家用户id
+ */
+ @PostMapping("insertMerchantAccount")
+ R addConvenientMerchantUser(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);
+
+ /**
+ * 修改便民服务商家绑定账号
+ * @param userId
+ * @param account
+ * @return
+ */
+ @PutMapping("putMerchantUserAccount")
+ R putUserAccount(@RequestParam("userId") Long userId, @RequestParam("account") String account);
+
+ /**
+ * 禁用/启用便民服务商家用户
+ * @param disableOrEnableConvenientMerchantDTO
+ * @return
+ */
+ @PutMapping("disableOrEnableMerchantUsers")
+ R disableOrEnableMerchantUsers(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);
}
--
Gitblit v1.7.1