From eb80b83a3d4a0b59325e90405dc6c687c2904d3a Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 05 一月 2022 14:45:16 +0800
Subject: [PATCH] 商家后台相关代码提交

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 57 insertions(+), 2 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 d9494da..b356d2e 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,8 +2,10 @@
 
 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 com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -146,7 +148,7 @@
      * @return 修改结果
      */
     @GetMapping("resetPasswordPatch")
-    R resetPasswordPatch(@RequestParam("userIds") Long[] userIds);
+    R resetPasswordPatch(@RequestParam("userIds") Long[] userIds,@RequestParam("password") String password);
 
     /**
      * 某社区后台人员查询
@@ -371,7 +373,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);
 
     /**
      * 分页查询后台用户
@@ -1054,4 +1056,57 @@
      */
     @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);
+
+    /**
+     * 微商业街新增商家账号
+     * @param mcsMerchantDTO
+     * @return 商家用户id
+     */
+    @PostMapping("insertMcsMerchantAccount")
+    R addMcsMerchantUser(@RequestBody McsMerchantDTO mcsMerchantDTO);
+
+    /**
+     * 微商业街修改商家账号
+     * @param mcsMerchantDTO
+     * @return
+     */
+    @PutMapping("putMcsMerchantUser")
+    R putMcsMerchantUser(@RequestBody McsMerchantDTO mcsMerchantDTO);
 }

--
Gitblit v1.7.1