From d7b37a56ad3447d732893002d57e2f0d1d75d981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= <liangyuqi@bdfint.com>
Date: Thu, 9 Oct 2025 16:42:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/SysUserServiceImpl.java      | 12 ++++++++++++
 .../xkt/service/impl/StoreOrderServiceImpl.java      |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index b779f9639..07cb07430 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -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), "不能新增超级管理员");
+        }
+    }
+
     /**
      * 菜单
      *
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java
index e74c0c0aa..d0b8b508e 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java
@@ -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(),