From f846f6d6779a64a0acda4e81ca69cb01607f13de Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Sat, 8 Nov 2025 22:08:33 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9Astore=5Fproduct=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0prod=5Fcate=5Fname=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/ry_20240629.sql                                       | 1 +
 xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java  | 5 +++++
 xkt/src/main/resources/mapper/StoreProductColorMapper.xml | 3 +--
 xkt/src/main/resources/mapper/StoreProductMapper.xml      | 3 +--
 xkt/src/main/resources/mapper/StoreProductStockMapper.xml | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql
index c5b1f2f1c..24940a5fb 100644
--- a/sql/ry_20240629.sql
+++ b/sql/ry_20240629.sql
@@ -3483,6 +3483,7 @@ CREATE TABLE `store_product`
     `id`                   bigint UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '档口商品ID',
     `store_id`             bigint UNSIGNED NOT NULL COMMENT '档口ID',
     `prod_cate_id`         bigint UNSIGNED NULL DEFAULT NULL COMMENT '商品分类ID',
+    `prod_cate_name`       varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类名称',
     `factory_art_num`      varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '工厂货号',
     `prod_art_num`         varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品货号',
     `prod_title`           varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题',
diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java
index fd5ced258..43e1fcfe5 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProduct.java
@@ -40,6 +40,11 @@ public class StoreProduct extends XktBaseEntity {
     @Excel(name = "商品分类ID")
     private Long prodCateId;
 
+    /**
+     * 商品分类名称
+     */
+    private String prodCateName;
+
     /**
      * 工厂货号
      */
diff --git a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml
index d1225941d..2f8ade377 100644
--- a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sp.prod_art_num,
             spc.color_name,
             sp.prod_cate_id,
-            pc.`name` AS prodCateName,
+            sp.prod_cate_name,
             spc.prod_status,
             spc.create_time,
             sf.file_url AS mainPicUrl,
@@ -40,7 +40,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             store_product_color spc
                 JOIN store_product sp ON spc.store_prod_id = sp.id
-                JOIN sys_product_category pc ON sp.prod_cate_id = pc.id
                 JOIN store_product_category_attribute spca ON spc.store_prod_id = spca.store_prod_id AND spca.del_flag = 0
                 LEFT JOIN store_product_file spf ON sp.id = spf.store_prod_id AND spf.file_type = 1 AND spf.order_num = 1 AND spf.del_flag = 0
                 LEFT JOIN sys_file sf ON spf.file_id = sf.id
diff --git a/xkt/src/main/resources/mapper/StoreProductMapper.xml b/xkt/src/main/resources/mapper/StoreProductMapper.xml
index 915bc3308..b4e785b2e 100644
--- a/xkt/src/main/resources/mapper/StoreProductMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreProductMapper.xml
@@ -266,11 +266,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             sp.prod_status,
             sp.prod_cate_id,
-            spc.`name` AS prodCateName,
+            sp.prod_cate_name,
             COUNT( sp.id ) AS cateCount
         FROM
             store_product sp
-                JOIN sys_product_category spc ON sp.prod_cate_id = spc.id
         WHERE
             sp.del_flag = 0
             AND sp.private_item = 0
diff --git a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml
index 85ca51f77..53c9cb337 100644
--- a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectStockPage" parameterType="com.ruoyi.xkt.dto.storeProductStock.StoreProdStockPageDTO"
             resultType="com.ruoyi.xkt.dto.storeProductStock.StoreProdStockPageResDTO">
         SELECT
-            sps.id AS storeProdStockId, sps.store_prod_id,  sps.prod_art_num, sps.store_color_id, sps.store_prod_color_id, sps.color_name, spc.name AS prodCateName,
+            sps.id AS storeProdStockId, sps.store_prod_id,  sps.prod_art_num, sps.store_color_id, sps.store_prod_color_id, sps.color_name, sp.prod_cate_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,
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             IFNULL(sps.size_38, 0) + IFNULL(sps.size_39, 0) + IFNULL(sps.size_40, 0) + IFNULL(sps.size_41, 0) +
             IFNULL(sps.size_42, 0) + IFNULL(sps.size_43, 0)) AS totalStock
         FROM
-            store_product_stock sps join store_product sp on sps.store_prod_id = sp.id join sys_product_category spc on sp.prod_cate_id = spc.id
+            store_product_stock sps join store_product sp on sps.store_prod_id = sp.id
         WHERE
             sps.del_flag = 0
             AND sps.store_id = #{storeId}