From 931ea9dcdf62ea348f1811b9faf95d07ab1c1ac8 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期日, 26 九月 2021 14:22:22 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index 69b68ce..51bb0f8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -5,6 +5,8 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
@@ -523,7 +525,7 @@
*
* @return 标签集合
*/
- R listTags(Long communityId);
+ R listTags();
/**
* 通过账号查询用户信息
@@ -687,4 +689,42 @@
*/
R getUserListByCommunityId(Long communityId);
+ /**
+ * 检查当前用户是否是社区工作人员
+ * @param phone
+ * @param communityId
+ * @return
+ */
+ R checkCurrentUserIsTeam(String phone, Long communityId);
+ /**
+ * 重置密码
+ */
+ R resetPassword(Long userId);
+
+ /**
+ * 批量重置密码
+ */
+ R resetPasswordPatch(Long[] userId);
+
+ /**
+ * 便民服务新增商家账号
+ * @param convenientMerchantDTO
+ * @return 商家用户id
+ */
+ R addConvenientMerchantUser(ConvenientMerchantDTO convenientMerchantDTO);
+
+ /**
+ * 修改便民服务商家绑定账号
+ * @param userId 用户id
+ * @param account 修改账户
+ * @return 修改结果
+ */
+ R putUserAccount(Long userId, String account);
+
+ /**
+ * 禁用/启用便民服务商家用户
+ * @param disableOrEnableConvenientMerchantDTO
+ * @return
+ */
+ R disableOrEnableMerchantUsers(DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);
}
--
Gitblit v1.7.1