From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 203f152..b03f0a2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -15,6 +15,7 @@
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.api.model.UserShop;
import com.ruoyi.system.api.query.ChangeUserQuery;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.query.GetSysUserList;
@@ -64,6 +65,9 @@
@Resource
private ISysUserRoleService sysUserRoleService;
+
+ @Resource
+ private UserShopService userShopService;
@@ -528,4 +532,39 @@
public SysUser getSysUserById(@RequestParam("userId") Long userId){
return userService.getById(userId);
}
+
+
+ /**
+ * 保存门店员工管理后台账号
+ * @param user
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/saveShopUser")
+ public R saveShopUser(@RequestBody SysUser user){
+ Integer shopId = user.getObjectId();
+ SysUser one = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, user.getPhonenumber()).eq(SysUser::getDelFlag, "0")
+ .eq(SysUser::getStatus, "0").eq(SysUser::getRoleType, 2).eq(SysUser::getAppUserId, user.getAppUserId()));
+ if(null == one){
+ user.setObjectId(null);
+ user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ userService.save(user);
+ //添加用户角色数据
+ SysUserRole userRole = new SysUserRole();
+ userRole.setUserId(user.getUserId());
+ userRole.setRoleId(2L);
+ userRoleService.save(userRole);
+ }else{
+ user = one;
+ }
+ //添加门店关系数据
+ UserShop userShop = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getShopId, shopId).eq(UserShop::getUserId, user.getAppUserId()));
+ if(null == userShop){
+ userShop = new UserShop();
+ userShop.setUserId(user.getUserId().intValue());
+ userShop.setShopId(user.getObjectId());
+ userShopService.save(userShop);
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1