From 14c16f352f2d8d083cd329da7fe2c065a4537c73 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期一, 26 四月 2021 14:01:47 +0800
Subject: [PATCH] fix:修改商家添加功能逻辑代码

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 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 fc17484..fd73d64 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,10 +8,12 @@
 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;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -611,6 +613,16 @@
     }
 
     /**
+     * 通过账号和渠道查询用户信息
+     * @param account
+     * @return
+     */
+    @GetMapping("getUserByAccount")
+    public R getSysUserVOByAccount(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type){
+        return userService.getSysUserVOByAccount(account, type);
+    }
+
+    /**
      *分页查询人口管理
      * @param pageInputUserDTO 查询参数
      * @return 分页数据
@@ -734,4 +746,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