From ac1dcb9e207e68f1aba51d6211d18bdc55bcff72 Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Thu, 9 Oct 2025 15:07:49 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E4=B8=8B=E5=8D=95=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E8=BF=9B=E8=B4=A7?=
 =?UTF-8?q?=E8=BD=A6=E6=8E=A5=E5=8F=A3=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xkt/QuickFunctionController.java          |  2 --
 .../xkt/service/IShoppingCartService.java     | 12 +++++++-
 .../service/impl/ShoppingCartServiceImpl.java | 29 +++++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/QuickFunctionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/QuickFunctionController.java
index d4f599e4b..1d71b8e8a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/QuickFunctionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/QuickFunctionController.java
@@ -32,8 +32,6 @@ public class QuickFunctionController extends XktBaseController {
     final IQuickFunctionService quickFuncService;
     final ISysMenuService menuService;
 
-    private static final String MENU_TYPE_C = "C";
-
     @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,seller,agent,store')")
     @ApiOperation(value = "档口或电商卖家选择的快捷功能", httpMethod = "GET", response = R.class)
     @GetMapping("/selected")
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IShoppingCartService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IShoppingCartService.java
index 9fe583fc5..8947a9bc5 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/IShoppingCartService.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/IShoppingCartService.java
@@ -54,7 +54,7 @@ public interface IShoppingCartService {
     Integer delete(ShopCartDeleteDTO deleteDTO);
 
     /**
-     * 根据storeProdid获取进货车详情
+     * 根据storeProdId获取进货车详情
      *
      * @param listDTO 档口商品ID列表
      * @return ShoppingCartDTO
@@ -75,4 +75,14 @@ public interface IShoppingCartService {
      * @return Integer
      */
     Integer updateDetailQuantity(ShopCartDetailQuantityUpdateDTO updateQuantityDTO);
+
+    /**
+     * 下单后，删除用户进货车商品
+     *
+     * @param storeProdId 档口商品ID
+     * @param userId      用户ID
+     * @return Integer
+     */
+    Integer removeShoppingCart(Long storeProdId, Long userId);
+
 }
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java
index 0a16980ab..99e0c6e9f 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java
@@ -330,6 +330,35 @@ public class ShoppingCartServiceImpl implements IShoppingCartService {
         return this.shopCartDetailMapper.updateById(detail);
     }
 
+    /**
+     * 下单后，删除用户进货车商品
+     *
+     * @param storeProdId 档口商品ID
+     * @param userId      用户ID
+     * @return Integer
+     */
+    @Override
+    @Transactional
+    public Integer removeShoppingCart(Long storeProdId, Long userId) {
+        // 用户进货车是否存在该商品
+        ShoppingCart shoppingCart = this.shopCartMapper.selectOne(new LambdaQueryWrapper<ShoppingCart>()
+                .eq(ShoppingCart::getStoreProdId, storeProdId).eq(ShoppingCart::getUserId, userId)
+                .eq(ShoppingCart::getDelFlag, Constants.UNDELETED));
+        if (ObjectUtils.isEmpty(shoppingCart)) {
+            return 0;
+        }
+        shoppingCart.setDelFlag(DELETED);
+        int count = this.shopCartMapper.updateById(shoppingCart);
+        // 找到进货车明细
+        List<ShoppingCartDetail> detailList = this.shopCartDetailMapper.selectList(new LambdaQueryWrapper<ShoppingCartDetail>()
+                .eq(ShoppingCartDetail::getShoppingCartId, shoppingCart.getId()).eq(ShoppingCartDetail::getDelFlag, Constants.UNDELETED));
+        if (CollectionUtils.isNotEmpty(detailList)) {
+            detailList.forEach(detail -> detail.setDelFlag(DELETED));
+            this.shopCartDetailMapper.updateById(detailList);
+        }
+        return count;
+    }
+
     /**
      * 获取档口商品颜色尺码的库存
      *