From 5f8dc1c5ae55add1c8f608a5209ca654b10e5057 Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Tue, 26 Aug 2025 22:17:01 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9Aapp=20=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=B0=83=E4=BC=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StoreProductStockServiceImpl.java    |  4 ++--
 .../mapper/StoreProductStockMapper.xml        | 21 ++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStockServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStockServiceImpl.java
index fc27477fc..99b41fded 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStockServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStockServiceImpl.java
@@ -65,10 +65,10 @@ public class StoreProductStockServiceImpl implements IStoreProductStockService {
         if (CollectionUtils.isEmpty(stockList)) {
             return Page.empty(pageDTO.getPageSize(), pageDTO.getPageNum());
         }
-        // 提取查询结果中的商店产品ID列表
+        // 提取查询结果中的商品ID列表
         List<Long> storeProdIdList = stockList.stream().map(StoreProdStockAppPageResDTO::getStoreProdId).collect(Collectors.toList());
         // 查找排名第一个商品主图列表
-        List<StoreProdMainPicDTO> mainPicList = this.storeProdFileMapper.selectMainPicByStoreProdIdList(storeProdIdList, FileType.MAIN_PIC.getValue(), 1);
+        List<StoreProdMainPicDTO> mainPicList = this.storeProdFileMapper.selectMainPicByStoreProdIdList(storeProdIdList, FileType.MAIN_PIC.getValue(), ORDER_NUM_1);
         Map<Long, String> mainPicMap = CollectionUtils.isEmpty(mainPicList) ? new HashMap<>() : mainPicList.stream()
                 .collect(Collectors.toMap(StoreProdMainPicDTO::getStoreProdId, StoreProdMainPicDTO::getFileUrl));
         // 为每个产品设置主图URL和标准尺码列表
diff --git a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml
index 677724b66..f9e71d3c1 100644
--- a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml
@@ -7,9 +7,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAppStockPage" parameterType="com.ruoyi.xkt.dto.storeProductStock.StoreProdStockPageDTO"
             resultType="com.ruoyi.xkt.dto.storeProductStock.StoreProdStockAppPageResDTO">
         SELECT
-            sps.id AS storeProdStockId, sps.store_prod_id,  sps.prod_art_num, sps.color_name,
-            sps.size_30 AS size30, sps.size_31 AS size31, sps.size_32 AS size32, sps.size_33 AS size33, sps.size_34 AS size34, sps.size_35 AS size35, sps.size_36 AS size36, sps.size_37 AS size37,
-            sps.size_38 AS size38, sps.size_39 AS size39, sps.size_40 AS size40, sps.size_41 AS size41, sps.size_42 AS size42, sps.size_43 AS size43,
+            sps.id AS storeProdStockId,
+            sps.store_prod_id,
+            sps.prod_art_num,
+            sps.color_name,
+            NULLIF( sps.size_30, 0 ) AS size30,
+            NULLIF( sps.size_31, 0 ) AS size31,
+            NULLIF( sps.size_32, 0 ) AS size32,
+            NULLIF( sps.size_33, 0 ) AS size33,
+            NULLIF( sps.size_34, 0 ) AS size34,
+            NULLIF( sps.size_35, 0 ) AS size35,
+            NULLIF( sps.size_36, 0 ) AS size36,
+            NULLIF( sps.size_37, 0 ) AS size37,
+            NULLIF( sps.size_38, 0 ) AS size38,
+            NULLIF( sps.size_39, 0 ) AS size39,
+            NULLIF( sps.size_40, 0 ) AS size40,
+            NULLIF( sps.size_41, 0 ) AS size41,
+            NULLIF( sps.size_42, 0 ) AS size42,
+            NULLIF( sps.size_43, 0 ) AS size43,
             (IFNULL(sps.size_30, 0) + IFNULL(sps.size_31, 0) + IFNULL(sps.size_32, 0) + IFNULL(sps.size_33, 0) +
             IFNULL(sps.size_34, 0) + IFNULL(sps.size_35, 0) + IFNULL(sps.size_36, 0) + IFNULL(sps.size_37, 0) +
             IFNULL(sps.size_38, 0) + IFNULL(sps.size_39, 0) + IFNULL(sps.size_40, 0) + IFNULL(sps.size_41, 0) +