From 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 13:15:59 +0800
Subject: [PATCH] Merge branch 'renhequ' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 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..490d3e7 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,7 @@
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;
@@ -146,7 +147,7 @@
* @return 修改结果
*/
@GetMapping("resetPasswordPatch")
- R resetPasswordPatch(@RequestParam("userIds") Long[] userIds);
+ R resetPasswordPatch(@RequestParam("userIds") Long[] userIds,@RequestParam("password") String password);
/**
* 某社区后台人员查询
@@ -371,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,@RequestParam("areaCode")String areaCode);
/**
* 分页查询后台用户
@@ -587,7 +588,7 @@
* @return 运营后台数据看板
*/
@PostMapping("datakanban")
- R dataKanban();
+ R dataKanban(@RequestParam("areaCode")String areaCode);
/**
* 用户菜单获取
@@ -1054,4 +1055,58 @@
*/
@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(@RequestParam("areaCode") String areaCode);
+
+ /**
+ * 运营后台-用户数据统计导出
+ * @return 用户数据
+ */
+ @GetMapping("community/statistics/export")
+ R communityStatisticsExport(@RequestParam("areaCode") String areaCode);
+
+ /**
+ * 通过UnionId获取用户信息
+ * @param unionId
+ * @return
+ */
+ @GetMapping("/getByUnionId")
+ R getUserInfoByUnionId(@RequestParam("unionId") String unionId);
+
+ /**
+ * 小程序id获取相关信息
+ * @param appId
+ * @return
+ */
+ @GetMapping("/sysAppConfig/selectByAppid")
+ R<SysAppConfigVO> selectByAppid(@RequestParam("appId")String appId);
+
+ /**
+ * 通过区域编码 类型获取动态模板id
+ * @param areaCode
+ * @param type
+ * @return
+ */
+ @GetMapping("/sysTemplateConfig/selectTemplate")
+ R<SysTemplateConfigVO> selectTemplate(@RequestParam("areaCode")String areaCode,@RequestParam("type")Integer type);
}
--
Gitblit v1.7.1