BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：去掉内里材质的必填项；

pull/1121/head
liujiang 2025-12-08 20:26:44 +08:00
parent 6d9cc88fe8
commit be3e1988e0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java
View File

@ -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 = "档口商品定价不能为空!")

7
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
View File

@ -379,7 +379,8 @@ public class StoreProductServiceImpl implements IStoreProductService {
// 当前商品待更新的storeColorId列表
List<Long> updateProdColorIdList = updateDTO.getSizeList().stream().map(StoreProdDTO.SPCSizeDTO::getColorName).map(storeColorMap::get).collect(Collectors.toList());
// 待更新的商品颜色内里map
Map<String, String> updateColorLineMaterialMap = updateDTO.getSizeList().stream().collect(Collectors.toMap(StoreProdDTO.SPCSizeDTO::getColorName, StoreProdDTO.SPCSizeDTO::getShoeUpperLiningMaterial, (v1, v2) -> v2));
Map<String, String> 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<StoreProductColor> prodColorList = new ArrayList<>();
final List<String> prodColorNameList = createDTO.getSizeList().stream().map(StoreProdDTO.SPCSizeDTO::getColorName).distinct().collect(Collectors.toList());
// 颜色与内里的关系
final Map<String, String> colorLiningMaterialMap = createDTO.getSizeList().stream().collect(Collectors
.toMap(StoreProdDTO.SPCSizeDTO::getColorName, StoreProdDTO.SPCSizeDTO::getShoeUpperLiningMaterial, (v1, v2) -> v2));
final Map<String, String> 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))