From 3c30e22b2fcac1ae29f7bfe104f3cc477e7e6951 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Tue, 16 Sep 2025 17:09:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/business/service/impl/ProductServiceImpl.java   | 2 +-
 .../service/impl/TbPromotionMaterialServiceImpl.java      | 2 +-
 .../resources/mapper/business/ProductScreenMapper.xml     | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/ProductServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/ProductServiceImpl.java
index dd08d63..0b8fdd3 100644
--- a/bonus-business/src/main/java/com/bonus/business/service/impl/ProductServiceImpl.java
+++ b/bonus-business/src/main/java/com/bonus/business/service/impl/ProductServiceImpl.java
@@ -385,7 +385,7 @@ public class ProductServiceImpl implements ProductService {
                 String originFileName = file.getOriginalFilename();
                 String suffix=StringUtils.substringAfterLast(originFileName, ".");
                 //产品 封面
-                String filePath = "/product" + "/" +
+                String filePath = "product" + "/" +
                         year + "/" + month + "/" + day + "/" + uuid + "." + suffix;
                 String path=service.uploadFile(file, filePath);
                 if(path==null){
diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/TbPromotionMaterialServiceImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/TbPromotionMaterialServiceImpl.java
index 50291fa..56e36c1 100644
--- a/bonus-business/src/main/java/com/bonus/business/service/impl/TbPromotionMaterialServiceImpl.java
+++ b/bonus-business/src/main/java/com/bonus/business/service/impl/TbPromotionMaterialServiceImpl.java
@@ -191,7 +191,7 @@ public class TbPromotionMaterialServiceImpl implements ITbPromotionMaterialServi
             String originFileName = file.getOriginalFilename();
             String suffix=StringUtils.substringAfterLast(originFileName, ".");
             //产品 封面
-            String filePath = "/material" + "/" +
+            String filePath = "material" + "/" +
                     year + "/" + month + "/" + day + "/" + uuid + "." + suffix;
             SysFile sysFile = fileUploadService.uploadLargeFile(file, filePath);
             TbPromotionMaterialFiles materialFile=new TbPromotionMaterialFiles();
diff --git a/bonus-business/src/main/resources/mapper/business/ProductScreenMapper.xml b/bonus-business/src/main/resources/mapper/business/ProductScreenMapper.xml
index 07cb2a5..5b8cb11 100644
--- a/bonus-business/src/main/resources/mapper/business/ProductScreenMapper.xml
+++ b/bonus-business/src/main/resources/mapper/business/ProductScreenMapper.xml
@@ -29,12 +29,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getMaterialList" resultType="com.bonus.business.domain.ProductScreenVo">
         select tpm.id, tpm.type_id typeId,sdd.dict_label typeName,tpm.name ,tpm.version ,tpm.description ,tpm.image ,
         pmf.file_type fileType ,pmf.file_path filePath, pmf.bucket_name bucketName,pmf.original_name   originalName
-        from tb_promotion_material tpm
+        from  tb_promotion_material_product pmp
+        left join tb_promotion_material tpm on pmp.material_id=tpm.id
         left join sys_dict_data sdd on sdd.dict_value=tpm.type_id  and sdd.dict_type='tb_product_type'
         left join tb_promotion_material_files pmf on tpm.id=pmf.material_id and pmf.del_flag=0  and  pmf.type_id=2
-        where tpm.del_flag=0
-        <if test="typeId!=null and typeId!=''">
-                and  tpm.type_id=#{typeId}
-        </if>
+        where tpm.del_flag=0  and pmp.product_id=#{id}
     </select>
 </mapper>
\ No newline at end of file