From 2eed30bdf447aca24369e31d23711fcf8b3678e9 Mon Sep 17 00:00:00 2001 From: liyj <1617420630@qq.com> Date: Mon, 1 Dec 2025 16:08:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87=E7=A9=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/product/ShopProductImage.java | 2 +- .../admin/ShopProductInfoController.java | 11 +++++++++ .../impl/ShopProductBaseServiceImpl.java | 23 ++++++++++++++++--- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductImage.java b/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductImage.java index c90d34dc..1d3aa8b7 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductImage.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductImage.java @@ -42,7 +42,7 @@ public class ShopProductImage implements Serializable { @ApiModelProperty(value = "规格值") private String color_name; - @ApiModelProperty(value = "商品主图") + @ApiModelProperty(value = "商品主图,0是编辑空图片，1是同步空图片") @TableField(updateStrategy = FieldStrategy.NOT_EMPTY) private String item_image_default; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/product/controller/admin/ShopProductInfoController.java b/mall-shop/src/main/java/com/suisung/mall/shop/product/controller/admin/ShopProductInfoController.java index 49bf85b3..b1296198 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/product/controller/admin/ShopProductInfoController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/controller/admin/ShopProductInfoController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.HashMap; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -114,6 +115,16 @@ public class ShopProductInfoController { QueryWrapper imageQueryWrapper = new QueryWrapper<>(); imageQueryWrapper.eq("product_id", product_id); List shopProductImages = imageService.find(imageQueryWrapper); + if(!shopProductImages.isEmpty()) { + shopProductImages=shopProductImages.stream().peek(s->{ + if(s.getItem_image_default().equals("0")||s.getItem_image_default().equals("1")) { + s.setItem_image_default(""); + } + if(s.getItem_image_other().equals("0")||s.getItem_image_other().equals("1")) { + s.setItem_image_other(""); + } + }).collect(Collectors.toList()); + } // shop_product_assist_index QueryWrapper indexQueryWrapper = new QueryWrapper<>(); indexQueryWrapper.eq("product_id", product_id); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java index 8676d492..082107a7 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java @@ -493,7 +493,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl item_image_other = Convert.toList(String.class, productItemMap.get("color_img")); String _str_item_spec = (String) productItemMap.get("product_spec"); @@ -587,7 +587,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl shopProductBases = gets(product_ids); + if(!shopProductBases.isEmpty()){ + shopProductBases=shopProductBases.stream().peek(s->{ + if (s.getProduct_image().equals("0")||s.getProduct_image().equals("1")){ + s.setProduct_image(""); + } + }).collect(Collectors.toList()); + } product_base_rows = Convert.toList(Map.class, shopProductBases); List ShopProductInfos = shopProductInfoService.gets(product_ids); List product_info_rows = Convert.toList(Map.class, ShopProductInfos); @@ -6507,7 +6514,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl cond_row = new QueryWrapper<>(); if (StrUtil.isNotBlank(productNumber)) { - cond_row.eq("product_number", productNumber); + cond_row.eq("product_number", productNumber.trim()); } cond_row.eq("store_id", store_id); List lists = shopProductIndexService.list(cond_row); @@ -6562,6 +6569,16 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl imageQueryWrapper = new QueryWrapper<>(); imageQueryWrapper.eq("product_id", productId); List shopProductImages = shopProductImageService.find(imageQueryWrapper); + if(!shopProductImages.isEmpty()){ + shopProductImages=shopProductImages.stream().peek(s->{ + if(s.getItem_image_default().equals("0")||s.getItem_image_default().equals("1")){ + s.setItem_image_default(""); + } + if(s.getItem_image_other().equals("0")||s.getItem_image_other().equals("1")){ + s.setItem_image_other(""); + } + }).collect(Collectors.toList()); + } // shop_product_assist_index QueryWrapper indexQueryWrapper = new QueryWrapper<>(); indexQueryWrapper.eq("product_id", productId);