From 717deb35e2654e41a9679fccc2e7409927a58912 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期日, 25 四月 2021 15:33:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index b6da775..fc72471 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -8,6 +8,7 @@
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 com.panzhihua.service_user.service.SysUserInputService;
import com.panzhihua.service_user.service.UserService;
@@ -611,13 +612,13 @@
}
/**
- * 通过账号查询用户信息
+ * 通过账号和渠道查询用户信息
* @param account
* @return
*/
@GetMapping("getUserByAccount")
- public R getSysUserVOByAccount(@RequestParam(value = "account") String account){
- return userService.getSysUserVOByAccount(account);
+ public R getSysUserVOByAccount(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type){
+ return userService.getSysUserVOByAccount(account, type);
}
/**
@@ -744,4 +745,34 @@
R specialUserExport(@RequestBody ExportSpecialUserDTO exportSpecialUserDTO) {
return sysUserInputService.specialUserExport(exportSpecialUserDTO);
}
+
+ /**
+ * 创建SysUser用户信息以及权限
+ * @param storeVO 请求参数
+ * @return 创建结果
+ */
+ @PostMapping("addSysUser")
+ public R addSysUser(@RequestBody ShopStoreVO storeVO){
+ return userService.addSysUser(storeVO);
+ }
+
+ /**
+ * 修改SysUser用户信息
+ * @param storeVO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editSysUser")
+ public R editSysUser(@RequestBody ShopStoreVO storeVO){
+ return userService.editSysUser(storeVO);
+ }
+
+ /**
+ * 修改用户小程序首页活动提示
+ * @param userEditTipsDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editUserTips")
+ public R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO) {
+ return userService.editUserTips(userEditTipsDTO);
+ }
}
--
Gitblit v1.7.1