From b22bc1a0d7931c9e91b96f1cd7c1c1855ff69ebf Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 18 一月 2022 13:46:11 +0800
Subject: [PATCH] Merge branch 'yibin' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 50aeef7..59403a8 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
@@ -377,7 +377,7 @@
* @return 角色集合
*/
@PostMapping("/role/listrolebackstage")
- R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize);
+ R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize,@RequestParam("areaCode")String areaCode);
/**
* 分页查询后台用户
@@ -593,7 +593,7 @@
* @return 运营后台数据看板
*/
@PostMapping("datakanban")
- R dataKanban();
+ R dataKanban(@RequestParam("areaCode")String areaCode);
/**
* 用户菜单获取
@@ -1081,14 +1081,14 @@
* @return 用户数据统计汇总
*/
@GetMapping("community/statistics")
- R communityStatistics();
+ R communityStatistics(@RequestParam("areaCode") String areaCode);
/**
* 运营后台-用户数据统计导出
* @return 用户数据
*/
@GetMapping("community/statistics/export")
- R communityStatisticsExport();
+ R communityStatisticsExport(@RequestParam("areaCode") String areaCode);
/**
* 通过UnionId获取用户信息
@@ -1099,6 +1099,23 @@
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);
+
+ /**
* 微商业街新增商家账号
* @param mcsMerchantDTO
* @return 商家用户id
--
Gitblit v1.7.1