From ff2f216595b8a6137ee1368cd35b365f6aa62179 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期日, 25 四月 2021 15:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 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 d7cc164..0008140 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
@@ -1,6 +1,7 @@
package com.panzhihua.common.service.user;
import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.user.*;
@@ -8,6 +9,7 @@
import com.panzhihua.common.model.vos.MenuVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -539,6 +541,14 @@
@GetMapping("getUserByPhone")
R getSysUserVOByPhone(@RequestParam(value = "phone") String phone);
+ /**
+ * 通过账号查询用户信息
+ * @param account
+ * @return
+ */
+ @GetMapping("getUserByAccount")
+ R getSysUserVOByAccountAndType(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type);
+
/**
* 基础数据》居民管理》居民列表
@@ -613,4 +623,50 @@
@PostMapping("common/data/special/tags/save")
R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO);
+ /**
+ * 删除特殊群体标签
+ * @param id
+ * @return
+ */
+ @DeleteMapping("common/data/special/tags/delete")
+ R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id);
+
+ /**
+ * 特殊群体导出
+ * @param exportSpecialUserDTO
+ * @return
+ */
+ @PostMapping("/common/data/special/export")
+ R specialUserExport(@RequestBody ExportSpecialUserDTO exportSpecialUserDTO);
+
+ /**
+ * 查询所有人员标签
+ * @return 标签集合
+ */
+ @PostMapping("listtag/getTag")
+ R listTags(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 添加SysUser信息
+ * @param storeVO sysUser信息
+ * @return 添加sysUser结果
+ */
+ @PostMapping("addSysUser")
+ R addSysUser(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 修改SysUser信息
+ * @param storeVO sysUser信息
+ * @return 修改结果
+ */
+ @PostMapping("editSysUser")
+ R editSysUser(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 修改用户小程序首页活动提示
+ * @param userEditTipsDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editUserTips")
+ R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO);
}
--
Gitblit v1.7.1