From dcd896a1e3d33eb641e1a76435d919a7de8186a9 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期一, 26 四月 2021 14:02:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index bb53378..97e87f5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -3,16 +3,15 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
-import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
+import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
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 java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -115,6 +114,12 @@
* @param type 1是志愿者 0 不是
*/
R putUserIsVolunteer(String phone, int type);
+ /**
+ * 修改用户志愿者状态
+ * @param userId 用户ID
+ * @param type 1是志愿者 0 不是
+ */
+ R putUserIsVolunteerById(Long userId, int type);
/**
* 用户绑定社区、小区
* @param loginUserInfoVO 社区小区数据
@@ -357,4 +362,34 @@
* @return 标签集合
*/
R listTags(Long communityId);
+
+ /**
+ * 通过账号查询用户信息
+ * @param account
+ * @param type
+ * @return
+ */
+
+ R getSysUserVOByAccount(String account, Integer type);
+
+ /**
+ * 新增SysUser
+ * @param storeVO 请求参数
+ * @return 新增结果
+ */
+ R addSysUser(ShopStoreVO storeVO);
+
+ /**
+ * 修改SysUser用户信息
+ * @param storeVO 请求参数
+ * @return 修改结果
+ */
+ R editSysUser(ShopStoreVO storeVO);
+
+ /**
+ * 修改用户小程序首页活动提示
+ * @param userEditTipsDTO 请求参数
+ * @return 修改结果
+ */
+ R editUserTips(SysUserEditTipsDTO userEditTipsDTO);
}
--
Gitblit v1.7.1