From 31b8c6fc8c13f6a6e04362801eec0fce85af7366 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 11 十一月 2021 08:54:04 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 66 ++++++++++++++++++++++++++++++++
1 files changed, 65 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 ee93224..5677f1a 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
@@ -2,9 +2,12 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.DataKanBansDto;
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;
@@ -227,6 +230,15 @@
* @return 新增结果
*/
R addUserBackstage(AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 新增社区后台物业，社会组织，业主委员会账户
+ *
+ * @param administratorsUserVO
+ * 账户信息
+ * @return 新增结果
+ */
+ R addUserBackstageProperty(AdministratorsUserVO administratorsUserVO);
/**
* 编辑运营、社区后台账户
@@ -514,7 +526,7 @@
*
* @return 标签集合
*/
- R listTags(Long communityId);
+ R listTags();
/**
* 通过账号查询用户信息
@@ -685,4 +697,56 @@
* @return
*/
R checkCurrentUserIsTeam(String phone, Long communityId);
+ /**
+ * 重置密码
+ */
+ R resetPassword(Long userId);
+
+ /**
+ * 批量重置密码
+ */
+ R resetPasswordPatch(Long[] userId,String password);
+
+ /**
+ * 便民服务新增商家账号
+ * @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);
+
+ /**
+ * 根据openid维护社区团队里是否注册
+ * @param openid 用户微信唯一标识
+ */
+ void judgeCommunityTeam(String openid);
+
+ /**
+ * 数据看板升级版
+ *
+ * @return 运营后台数据看板升级版
+ */
+ R dataKanBans(DataKanBansDto dataKanBansDto);
+
+ /**
+ * 运营后台-用户数据统计汇总
+ * @return 用户数据统计汇总
+ */
+ R communityStatistics();
+
+ R communityStatisticsExport();
}
--
Gitblit v1.7.1