From 6178311b8990bfd7ff902f43b3932f198437138b Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Sat, 12 Apr 2025 14:38:14 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E8=BF=9B=E8=B4=A7=E8=BD=A6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B0=83=E4=BC=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ShopCartPageDetailResDTO.java             |  2 +
 .../ruoyi/xkt/mapper/ShoppingCartMapper.java  | 10 ++
 .../service/impl/ShoppingCartServiceImpl.java |  8 ++
 .../resources/mapper/ShoppingCartMapper.xml   | 96 +++++++------------
 4 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageDetailResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageDetailResDTO.java
index 426d28b82..dec4ca5a5 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageDetailResDTO.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShopCartPageDetailResDTO.java
@@ -20,6 +20,8 @@ public class ShopCartPageDetailResDTO {
 
     @ApiModelProperty(value = "进货车明细ID")
     private Long shoppingCartDetailId;
+    @ApiModelProperty(value = "进货单ID")
+    private Long shoppingCartId;
     @ApiModelProperty(value = "档口商品颜色ID")
     private Long storeProdColorId;
     @ApiModelProperty(value = "尺码")
diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/ShoppingCartMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/ShoppingCartMapper.java
index 6e6de028f..7257fdae2 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/mapper/ShoppingCartMapper.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/ShoppingCartMapper.java
@@ -3,7 +3,9 @@ package com.ruoyi.xkt.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.xkt.domain.ShoppingCart;
 import com.ruoyi.xkt.dto.userShoppingCart.ShopCartPageDTO;
+import com.ruoyi.xkt.dto.userShoppingCart.ShopCartPageDetailResDTO;
 import com.ruoyi.xkt.dto.userShoppingCart.ShopCartPageResDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,6 +22,14 @@ public interface ShoppingCartMapper extends BaseMapper<ShoppingCart> {
      * @param pageDTO 进货单列表查询入参
      * @return List<ShopCartPageResDTO>
      */
+
     List<ShopCartPageResDTO> selectShopCartPage(ShopCartPageDTO pageDTO);
 
+    /**
+     * 根据进货车ID列表查询详情列表
+     * @param shoppingCartIdList 进货车ID列表
+     * @return
+     */
+    List<ShopCartPageDetailResDTO> selectDetailList(@Param("shoppingCartIdList") List<Long> shoppingCartIdList);
+
 }
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 b6bc6cc90..29e653aaa 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
@@ -95,6 +95,14 @@ public class ShoppingCartServiceImpl implements IShoppingCartService {
         pageDTO.setUserId(loginUser.getUserId());
         PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize());
         List<ShopCartPageResDTO> shoppingCartList = this.shopCartMapper.selectShopCartPage(pageDTO);
+        if (CollectionUtils.isEmpty(shoppingCartList)) {
+            return Page.empty(pageDTO.getPageNum(), pageDTO.getPageSize());
+        }
+        // 进货单明细列表
+        List<ShopCartPageDetailResDTO> detailList = this.shopCartMapper.selectDetailList(shoppingCartList.stream()
+                .map(ShopCartPageResDTO::getShoppingCartId).distinct().collect(Collectors.toList()));
+        Map<Long, List<ShopCartPageDetailResDTO>> detailMap = detailList.stream().collect(Collectors.groupingBy(ShopCartPageDetailResDTO::getShoppingCartId));
+        shoppingCartList.forEach(x -> x.setDetailList(detailMap.getOrDefault(x.getShoppingCartId(), new ArrayList<>())));
         // 查找排名第一个商品主图列表
         List<StoreProdMainPicDTO> mainPicList = this.prodFileMapper.selectMainPicByStoreProdIdList(shoppingCartList.stream()
                 .map(ShopCartPageResDTO::getStoreProdId).collect(Collectors.toList()), FileType.MAIN_PIC.getValue(), ORDER_NUM_1);
diff --git a/xkt/src/main/resources/mapper/ShoppingCartMapper.xml b/xkt/src/main/resources/mapper/ShoppingCartMapper.xml
index 7de788769..e513f6afe 100644
--- a/xkt/src/main/resources/mapper/ShoppingCartMapper.xml
+++ b/xkt/src/main/resources/mapper/ShoppingCartMapper.xml
@@ -3,76 +3,51 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.xkt.mapper.ShoppingCartMapper">
-    
-    <resultMap type="ShoppingCart" id="UserShoppingCartResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="storeId"    column="store_id"    />
-        <result property="storeProdColorSizeId"    column="store_prod_color_size_id"    />
-        <result property="storeProdId"    column="store_prod_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="version"    column="version"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
 
-    <!-- 主 resultMap -->
-    <resultMap id="shopCartPageResultMap" type="com.ruoyi.xkt.dto.userShoppingCart.ShopCartPageResDTO">
-        <!-- 映射主表字段 -->
-        <id property="shoppingCartId" column="shopping_cart_id"/>
-        <result property="storeId" column="store_id"/>
-        <result property="storeProdId" column="store_prod_id"/>
-        <result property="storeName" column="store_name"/>
-        <result property="prodArtNum" column="prod_art_num"/>
-        <result property="prodTitle" column="prod_title"/>
-        <result property="prodStatus" column="prod_status"/>
 
-        <!-- 使用 collection 映射 detailList -->
-        <collection property="detailList" ofType="com.ruoyi.xkt.dto.userShoppingCart.ShopCartPageDetailResDTO">
-            <id property="shoppingCartDetailId" column="shopping_cart_detail_id"/>
-            <result property="storeProdColorId" column="store_prod_color_id"/>
-            <result property="size" column="size"/>
-            <result property="storeColorId" column="store_color_id"/>
-            <result property="colorName" column="color_name"/>
-            <result property="quantity" column="quantity"/>
-            <result property="standardSize" column="standard_size"/>
-            <result property="price" column="price"/>
-            <result property="amount" column="amount"/>
-        </collection>
-    </resultMap>
-
-    <!-- 查询语句 -->
-    <select id="selectShopCartPage" resultMap="shopCartPageResultMap">
+    <select id="selectDetailList" parameterType="Long" resultType="com.ruoyi.xkt.dto.userShoppingCart.ShopCartPageDetailResDTO">
         SELECT
+            scd.id AS shopping_cart_detail_id,
+            scd.shopping_cart_id,
+            scd.store_prod_color_id,
+            scd.size,
+            scd.store_color_id,
+            scd.color_name,
+            scd.quantity,
+            spcp.price,
+            ( scd.quantity * spcp.price ) AS amount
+        FROM
+            shopping_cart_detail scd
+                LEFT JOIN store_product_color_price spcp ON scd.store_prod_color_id = spcp.id
+        WHERE
+            scd.del_flag = 0
+            AND scd.shopping_cart_id IN
+            <foreach item="id" collection="shoppingCartIdList" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+    </select>
+
+    <select id="selectShopCartPage" resultType="com.ruoyi.xkt.dto.userShoppingCart.ShopCartPageResDTO">
+        SELECT DISTINCT
             sc.id AS shopping_cart_id,
-            s.id AS store_id,
+            sc.store_id,
             sc.store_prod_id,
             s.store_name,
             sp.prod_art_num,
             sp.prod_title,
-            scd.id AS shopping_cart_detail_id,
-            scd.store_prod_color_id,
-            scd.store_color_id,
-            scd.color_name,
-            scd.size,
-            scd.quantity,
-            spcp.price,
-            (scd.quantity * spcp.price) AS amount,
             CASE
                 sp.prod_status
-                WHEN 2 THEN '在售'
-                WHEN 4 THEN '已下架'
-                WHEN 5 THEN '已删除'
-                END AS prod_status,
+                WHEN 2 THEN
+                    '在售'
+                WHEN 4 THEN
+                    '已下架'
+                WHEN 5 THEN
+                    '已删除'
+                END AS prod_status
         FROM
             shopping_cart sc
-            LEFT JOIN shopping_cart_detail scd ON sc.id = scd.shopping_cart_id
-            LEFT JOIN store_product sp ON sc.store_prod_id = sp.id
-            LEFT JOIN store_product_color_price spcp ON scd.store_prod_color_id = spcp.id
-            LEFT JOIN store s ON sc.store_id = s.id
+                LEFT JOIN store s ON sc.store_id = s.id
+                LEFT JOIN store_product sp ON sc.store_prod_id = sp.id
         WHERE
             sc.del_flag = 0
             AND sc.user_id = #{userId}
@@ -84,8 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND sp.prod_art_num = #{prodArtNum}
             </if>
             <if test="storeName != null and storeName != ''">
-                AND s.store_name = #{storeName}
+                AND s.store_name like concat('%', #{storeName}, '%')
             </if>
+        ORDER BY
+            sc.store_id,
+            sc.id DESC
     </select>