From c83cf9d2d82a0a29a15e38f4566eb470b9a3517b Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 22 二月 2022 09:57:51 +0800
Subject: [PATCH] 抽奖相关提交

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   77 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 1 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 8941552..4a592f0 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,9 @@
 
 import java.util.List;
 
+import com.panzhihua.common.model.dtos.DataKanBansDto;
+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.*;
 
@@ -135,6 +138,16 @@
      */
     @GetMapping("resetPassword")
     R resetPassword(@RequestParam("userId") Long userId);
+
+    /**
+     * 批量重置密码用户登录密码默认admin123456
+     *
+     * @param userIds
+     *            新密码
+     * @return 修改结果
+     */
+    @GetMapping("resetPasswordPatch")
+    R resetPasswordPatch(@RequestParam("userIds") Long[] userIds,@RequestParam("password") String password);
 
     /**
      * 某社区后台人员查询
@@ -359,7 +372,7 @@
      * @return 角色集合
      */
     @PostMapping("/role/listrolebackstage")
-    R listRoleBackstage(@RequestParam("communityId") Long communityId);
+    R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize);
 
     /**
      * 分页查询后台用户
@@ -1017,4 +1030,66 @@
      */
     @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);
+
+    /**
+     * 根据openid维护社区团队里是否注册
+     * @param openid    用户微信唯一标识
+     */
+    @GetMapping("judgeCommunityTeam")
+    void judgeCommunityTeam(@RequestParam("openid") String openid);
+
+    /**
+     * 数据看板升级版
+     *
+     * @return 运营后台数据看板升级版
+     */
+    @PostMapping("datakanbans")
+    R dataKanBans(@RequestBody DataKanBansDto dataKanBansDto);
+
+    /**
+     * 运营后台-用户数据统计汇总
+     * @return  用户数据统计汇总
+     */
+    @GetMapping("community/statistics")
+    R communityStatistics();
+
+    /**
+     * 运营后台-用户数据统计导出
+     * @return  用户数据
+     */
+    @GetMapping("community/statistics/export")
+    R communityStatisticsExport();
+
+    /**
+     * 通过UnionId获取用户信息
+     * @param unionId
+     * @return
+     */
+    @GetMapping("/getByUnionId")
+    R getUserInfoByUnionId(@RequestParam("unionId") String unionId);
 }

--
Gitblit v1.7.1