From be3e1988e0ef9b66f989e4f1bf38be8fb897ee4c Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 8 Dec 2025 20:26:44 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=8E=BB=E6=8E=89=E5=86=85?= =?UTF-8?q?=E9=87=8C=E6=9D=90=E8=B4=A8=E7=9A=84=E5=BF=85=E5=A1=AB=E9=A1=B9?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/xkt/vo/storeProd/StoreProdCreateVO.java | 3 +-- .../ruoyi/xkt/service/impl/StoreProductServiceImpl.java | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java index 44935dc67..8acdbc8da 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java @@ -194,8 +194,7 @@ public class StoreProdCreateVO { @NotBlank(message = "颜色名称不能为空!") @ApiModelProperty(value = "颜色名称", required = true) private String colorName; - @NotBlank(message = "内里材质不可为空!") - @ApiModelProperty(value = "内里材质", required = true) + @ApiModelProperty(value = "内里材质") private String shoeUpperLiningMaterial; @ApiModelProperty(value = "商品尺码", required = true) @NotNull(message = "档口商品定价不能为空!") 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 5695063c5..b902131ca 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 @@ -379,7 +379,8 @@ public class StoreProductServiceImpl implements IStoreProductService { // 当前商品待更新的storeColorId列表 List updateProdColorIdList = updateDTO.getSizeList().stream().map(StoreProdDTO.SPCSizeDTO::getColorName).map(storeColorMap::get).collect(Collectors.toList()); // 待更新的商品颜色内里map - Map updateColorLineMaterialMap = updateDTO.getSizeList().stream().collect(Collectors.toMap(StoreProdDTO.SPCSizeDTO::getColorName, StoreProdDTO.SPCSizeDTO::getShoeUpperLiningMaterial, (v1, v2) -> v2)); + Map updateColorLineMaterialMap = updateDTO.getSizeList().stream().filter(x -> StringUtils.isNotBlank(x.getShoeUpperLiningMaterial())) + .collect(Collectors.toMap(StoreProdDTO.SPCSizeDTO::getColorName, StoreProdDTO.SPCSizeDTO::getShoeUpperLiningMaterial, (v1, v2) -> v2)); dbProdColorList.stream() // 判断有哪些是删除的颜色 .filter(color -> !updateProdColorIdList.contains(color.getStoreColorId())) @@ -519,8 +520,8 @@ public class StoreProductServiceImpl implements IStoreProductService { List prodColorList = new ArrayList<>(); final List prodColorNameList = createDTO.getSizeList().stream().map(StoreProdDTO.SPCSizeDTO::getColorName).distinct().collect(Collectors.toList()); // 颜色与内里的关系 - final Map colorLiningMaterialMap = createDTO.getSizeList().stream().collect(Collectors - .toMap(StoreProdDTO.SPCSizeDTO::getColorName, StoreProdDTO.SPCSizeDTO::getShoeUpperLiningMaterial, (v1, v2) -> v2)); + final Map colorLiningMaterialMap = createDTO.getSizeList().stream().filter(x -> StringUtils.isNotBlank(x.getShoeUpperLiningMaterial())) + .collect(Collectors.toMap(StoreProdDTO.SPCSizeDTO::getColorName, StoreProdDTO.SPCSizeDTO::getShoeUpperLiningMaterial, (v1, v2) -> v2)); for (int i = 0; i < prodColorNameList.size(); i++) { prodColorList.add(new StoreProductColor().setStoreColorId(storeColorMap.get(prodColorNameList.get(i))).setStoreProdId(storeProdId) .setShoeUpperLiningMaterial(colorLiningMaterialMap.get(prodColorNameList.get(i))).setColorName(prodColorNameList.get(i))