BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/liu-jiangs-project/RuoYi-Vue

pull/1121/head
liujiang 2025-10-09 16:46:06 +08:00
parent 5e5e5519aa d7b37a56ad
commit 5a63f4779f
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@ -90,6 +90,7 @@ public class SysUserServiceImpl implements ISysUserService {
@Override
public Long createUser(UserInfoEdit userEdit) {
checkRoles(userEdit.getRoleIds());
checkSupperAdmin(userEdit.getUserId(), userEdit.getRoleIds());
// 创建用户
SysUser user = BeanUtil.toBean(userEdit, SysUser.class);
if (StrUtil.isNotEmpty(userEdit.getPassword())) {
@ -109,6 +110,7 @@ public class SysUserServiceImpl implements ISysUserService {
@Override
public Long updateUser(UserInfoEdit userEdit) {
checkRoles(userEdit.getRoleIds());
checkSupperAdmin(userEdit.getUserId(), userEdit.getRoleIds());
// 修改用户信息
Assert.notNull(userEdit.getUserId());
SysUser user = userMapper.selectById(userEdit.getUserId());
@ -539,6 +541,16 @@ public class SysUserServiceImpl implements ISysUserService {
}
}
private void checkSupperAdmin(Long userId, List<Long> roleIds) {
if (Long.valueOf(1).equals(userId)) {
Assert.isTrue(CollUtil.emptyIfNull(roleIds).contains(ESystemRole.SUPER_ADMIN.getId()),
"不能移除超级管理员");
}
if (CollUtil.emptyIfNull(roleIds).contains(ESystemRole.SUPER_ADMIN.getId())) {
Assert.isTrue(Long.valueOf(1).equals(userId), "不能新增超级管理员");
}
}
/**
* 菜单
*

4
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java
View File

@ -85,6 +85,8 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
@Autowired
private IFinanceBillService financeBillService;
@Autowired
private IShoppingCartService shoppingCartService;
@Autowired
private List<PaymentManager> paymentManagers;
@Autowired
private Kuaidi100Client kuaidi100Client;
@ -105,6 +107,8 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
Map<Long, StoreProductColorSize> spcsMap = detailCheckRtn.getSpcsMap();
Map<Long, StoreProduct> spMap = detailCheckRtn.getSpMap();
Map<Long, StoreColor> scMap = detailCheckRtn.getScMap();
//清空购物车
spMap.keySet().forEach(spId -> shoppingCartService.removeShoppingCart(spId, orderUserId));
//快递费配置
ExpressFeeConfig expressFeeConfig = expressService.getExpressFeeConfig(expressId,
storeOrderAddDTO.getDestinationProvinceCode(), storeOrderAddDTO.getDestinationCityCode(),