From b92edf56e7e25440e7c46b967aa5373a7a8b25c2 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 14 三月 2022 09:22:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 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..81bd154 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
@@ -224,7 +224,7 @@
* @return 人员详情
*/
@PostMapping("detailuser")
- R detailUser(@RequestParam("userId") Long userId);
+ R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId);
/**
* 设置用户标签
@@ -349,6 +349,17 @@
@PostMapping("adduserbackstageproperty")
R addUserBackstageProperty(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 更新
+ *
+ * @param administratorsUserVO
+ * 编辑账户内容
+ * @return 编辑结果
+ */
+ @PostMapping("updateStreet")
+ R updateStreet(@RequestBody AdministratorsUserVO administratorsUserVO);
+
/**
* 编辑运营、社区后台账户
*
@@ -377,7 +388,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 +604,7 @@
* @return 运营后台数据看板
*/
@PostMapping("datakanban")
- R dataKanban();
+ R dataKanban(@RequestParam("areaCode")String areaCode);
/**
* 用户菜单获取
@@ -1081,14 +1092,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获取用户信息
@@ -1097,6 +1108,23 @@
*/
@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);
/**
* 微商业街新增商家账号
@@ -1163,4 +1191,11 @@
*/
@PostMapping("/mcs/bindPhone")
R bindOrAddMcsUser(@RequestBody @Valid BindUserPhoneDTO bindUserPhoneDTO);
+
+ /**
+ * 删除用户信息缓存
+ * @param phone
+ */
+ @DeleteMapping("/deleteUserCashByPhone")
+ R deleteUserCashByPhone(@RequestParam("phone") String phone);
}
--
Gitblit v1.7.1