From dad5e5fd2abbf5d77d23f1b9a4500a9ae9bf274d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 13:27:45 +0800
Subject: [PATCH] 仁和东区代码提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 59 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 2940a11..2c99dff 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;
@@ -411,7 +414,7 @@
      * 
      * @return 展示数据
      */
-    R dataKanban();
+    R dataKanban(String areaCode);
 
     /**
      * 社区管理后台数据看板
@@ -698,4 +701,59 @@
      * 重置密码
      */
     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(String areaCode);
+
+    R communityStatisticsExport(String areaCode);
+
+    /**
+     * 通过UnionId获取用户信息
+     * @param unionId
+     * @return
+     */
+    R getUserInfoByUnionId(String unionId);
 }

--
Gitblit v1.7.1