From dc5e629d2c6ac72d19c85ee3cfe2428fdd400e8e Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Tue, 18 Nov 2025 11:35:02 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E8=B0=83?=
 =?UTF-8?q?=E4=BC=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StoreProdDemandDownloadDTO.java             |  4 ++--
 .../ruoyi/xkt/mapper/StoreProductMapper.java    |  7 -------
 .../service/impl/StoreProductServiceImpl.java   | 11 -----------
 .../StoreCustomerProductDiscountMapper.xml      |  5 ++++-
 .../resources/mapper/StoreProductMapper.xml     | 17 ++---------------
 5 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java
index acf3c5efe..d0aa7a13d 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java
@@ -14,6 +14,8 @@ import org.apache.poi.ss.usermodel.IndexedColors;
 @Accessors(chain = true)
 public class StoreProdDemandDownloadDTO {
 
+    @Excel(name = "日期", width = 4, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
+    private String createTime;
     @Excel(name = "客户", width = 10, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
     private String partnerName;
     @Excel(name = "商标", width = 10, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
@@ -22,8 +24,6 @@ public class StoreProdDemandDownloadDTO {
     private String facName;
     @Excel(name = "需求单号", needMerge = true, width = 18, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
     private String code;
-    @Excel(name = "日期", width = 4, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
-    private String createTime;
     @Excel(name = "工厂货号", width = 10, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
     private String factoryArtNum;
     @Excel(name = "商品货号", width = 10, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java
index a9d3f7d2f..6cf59864d 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java
@@ -38,13 +38,6 @@ public interface StoreProductMapper extends BaseMapper<StoreProduct> {
      */
     List<ProductESDTO> selectESDTOList(@Param("idList") List<Long> idList);
 
-    /**
-     * 获取风格列表
-     *
-     * @return
-     */
-    List<String> getStyleList();
-
     /**
      * 获取档口商品的sku列表
      *
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
index 374a8c5b6..fe460a914 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
@@ -823,17 +823,6 @@ public class StoreProductServiceImpl implements IStoreProductService {
         return this.storeProdMapper.fuzzyQueryResPicList(storeId, prodArtNum);
     }
 
-    /**
-     * 获取商品所有的风格
-     *
-     * @return List<String>
-     */
-    @Override
-    @Transactional(readOnly = true)
-    public List<String> getStyleList() {
-        return this.storeProdMapper.getStyleList();
-    }
-
     /**
      * APP获取档口商品详情
      *
diff --git a/xkt/src/main/resources/mapper/StoreCustomerProductDiscountMapper.xml b/xkt/src/main/resources/mapper/StoreCustomerProductDiscountMapper.xml
index 7b80ea4ed..4dc406dd9 100644
--- a/xkt/src/main/resources/mapper/StoreCustomerProductDiscountMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreCustomerProductDiscountMapper.xml
@@ -32,6 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDiscPageRelate" resultType="com.ruoyi.xkt.dto.storeCusProdDiscount.StoreCusProdDiscPageResDTO">
         SELECT
             spc.id AS storeProdColorId,
+            spc.store_prod_id,
+            spc.store_color_id,
             spc.color_name,
             MIN(spcs.price) AS price
         FROM
@@ -45,7 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY
             spc.id,
             spc.store_prod_id,
-            spc.store_color_id
+            spc.store_color_id,
+            spc.color_name
     </select>
 
     <update id="deleteProdDisc">
diff --git a/xkt/src/main/resources/mapper/StoreProductMapper.xml b/xkt/src/main/resources/mapper/StoreProductMapper.xml
index b4e785b2e..f1d353faf 100644
--- a/xkt/src/main/resources/mapper/StoreProductMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreProductMapper.xml
@@ -55,20 +55,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="getStyleList" >
-        SELECT
-            style
-        FROM
-            store_product_category_attribute
-        WHERE
-            del_flag = 0 AND style != ''
-        GROUP BY
-            style
-        ORDER BY
-            COUNT( 1 ) DESC
-    </select>
-
-
     <select id="selectSkuList"  resultType="com.ruoyi.xkt.dto.storeProduct.StoreProdSkuDTO" >
         SELECT
             spc.id AS storeProdColorId,
@@ -276,7 +262,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND sp.store_id = #{storeId}
         GROUP BY
             sp.prod_status,
-            sp.prod_cate_id
+            sp.prod_cate_id,
+            sp.prod_cate_name
         ORDER BY
             cateCount DESC
     </select>