From 297512bc22b179b7038d96a1ff033eceaed38c4b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 07 三月 2025 19:44:31 +0800
Subject: [PATCH] 新增加809对接逻辑
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 80 ----------------------------------------
1 files changed, 0 insertions(+), 80 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 04afe60..f054c6e 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
@@ -3,10 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.admin.api.feignClient.AppUserClient;
-import com.ruoyi.admin.api.feignClient.AppUserShopClient;
-import com.ruoyi.admin.api.model.AppUser;
-import com.ruoyi.admin.api.model.AppUserShop;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
@@ -82,12 +78,6 @@
@Autowired
private ISysMenuService menuService;
-
- @Resource
- private AppUserClient appUserClient;
-
- @Resource
- private AppUserShopClient appUserShopClient;
@@ -131,76 +121,6 @@
}
if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(user)) {
return error("登录账号重复");
- }
- //门店员工添加数据，需要判断账号是否存在，共用同一个账号
- if(2 == sysUser1.getRoleType()){
- AppUser appUser = appUserClient.getAppUserByPhone1(user.getPhonenumber()).getData();
- if(null == appUser){
- return error("请先注册小程序账号");
- }
- SysUser one2 = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, user.getPhonenumber())
- .eq(SysUser::getDelFlag, "0").eq(SysUser::getStatus, "0").eq(SysUser::getObjectId, sysUser1.getObjectId())
- .eq(SysUser::getRoleType, 2));
- if(null != one2){
- return error("登录账号重复");
- }
- SysUser one = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, user.getPhonenumber())
- .eq(SysUser::getDelFlag, "0").eq(SysUser::getStatus, "0").eq(SysUser::getRoleType, 2));
- if(null == one){
- user.setCreateBy(SecurityUtils.getUsername());
- user.setPassword(SecurityUtils.encryptPassword(MD5Generator.generateMD5("a123456")));
-
- user.setRoleType(sysUser1.getRoleType());
- user.setObjectId(sysUser1.getObjectId());
- if(null != appUser){
- user.setAppUserId(appUser.getId());
- }
- userService.insertUser(user);
- one = user;
- SysUserRole sysUserRole = new SysUserRole();
- sysUserRole.setRoleId(user.getRoleId());
- sysUserRole.setUserId(user.getUserId());
- userRoleService.insertSysUserRole(sysUserRole);
-
- }
- //添加小程序店员关系数据
- if(null != appUser){
- List<AppUserShop> data = appUserShopClient.getAppUserShop(appUser.getId()).getData();
- Optional<AppUserShop> first = data.stream().filter(s -> s.getShopId().equals(sysUser1.getObjectId())).findFirst();
- if(!first.isPresent()){
- AppUserShop appUserShop = new AppUserShop();
- appUserShop.setAppUserId(appUser.getId());
- appUserShop.setShopId(sysUser1.getObjectId());
- appUserShop.setRoleType(2);
- appUserShopClient.saveAppUserShop(appUserShop);
- appUser.setUserType(2);
- appUserClient.editAppUserById(appUser);
- }
- }
-
- //添加门店员工关系数据
- UserShop one1 = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, one.getUserId()).eq(UserShop::getShopId, sysUser1.getObjectId()));
- if(null == one1){
- UserShop userShop = new UserShop();
- userShop.setUserId(one.getUserId());
- userShop.setShopId(sysUser1.getObjectId());
- userShop.setRoleType(2);
- userShop.setRoleId(user.getRoleId());
- userShop.setDeptId(user.getDeptId());
- userShop.setNickName(user.getNickName());
- userShop.setCreateTime(LocalDateTime.now());
- userShopService.save(userShop);
- }
- }else{
- user.setCreateBy(SecurityUtils.getUsername());
- user.setPassword(SecurityUtils.encryptPassword(MD5Generator.generateMD5("a123456")));
-
- user.setRoleType(sysUser1.getRoleType());
- userService.insertUser(user);
- SysUserRole sysUserRole = new SysUserRole();
- sysUserRole.setRoleId(user.getRoleId());
- sysUserRole.setUserId(user.getUserId());
- userRoleService.insertSysUserRole(sysUserRole);
}
return AjaxResult.success();
}
--
Gitblit v1.7.1