diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsImportDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsImportDTO.java index 39c2d25b0..ca985c7df 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsImportDTO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsImportDTO.java @@ -7,7 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; -import java.util.Map; /** * 商品导入DTO @@ -36,7 +35,7 @@ public class GoodsImportDTO { private Boolean release; @ApiModelProperty(value = "商品图片") - private List> images; + private List images; private List goodsGalleryList; @ApiModelProperty(value = "成本价") diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/SpecValueVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/SpecValueVO.java index 89a9d5407..c46bfc1f0 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/SpecValueVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/SpecValueVO.java @@ -32,18 +32,5 @@ public class SpecValueVO implements Serializable { * 规格图片 */ @ApiModelProperty(value = "规格的图片") - private List specImage; - - @Data - public static class SpecImages implements Serializable { - - private static final long serialVersionUID = 1816357809660916086L; - - private String url; - - private String name; - - private String status; - - } + private List specImage; } diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsImportServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsImportServiceImpl.java index bcf056c20..e8169538b 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsImportServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsImportServiceImpl.java @@ -33,7 +33,9 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.net.URLEncoder; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; @Slf4j @Service @@ -203,15 +205,11 @@ public class GoodsImportServiceImpl implements GoodsImportService { goodsImportDTO.setCategory(category); goodsImportDTO.setTemplate(templateId); goodsImportDTO.setGoodsUnit(objects.get(4).toString().substring(objects.get(4).toString().indexOf("-") + 1)); - goodsImportDTO.setRelease(objects.get(5).toString().equals("上架") ? true : false); + goodsImportDTO.setRelease(objects.get(5).toString().equals("上架")); - List> images = new ArrayList<>(); List goodsGalleryList = new ArrayList<>(); - Map map = new HashMap<>(); - map.put("url", objects.get(6).toString()); - images.add(map); goodsGalleryList.add(objects.get(6).toString()); - goodsImportDTO.setImages(images); + goodsImportDTO.setImages(goodsGalleryList); goodsImportDTO.setGoodsGalleryList(goodsGalleryList); goodsImportDTO.setCost(Convert.toDouble(objects.get(7))); diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java index 38c8bfaeb..97e202ec2 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java @@ -334,6 +334,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl i } } + goodsSkuDetail.getGoodsGalleryList().addAll(goodsVO.getGoodsGalleryList()); map.put("data", goodsSkuDetail); //获取分类 @@ -474,13 +475,10 @@ public class GoodsSkuServiceImpl extends ServiceImpl i SpecValueVO specValueVO = new SpecValueVO(); if ("images".equals(entry.getKey())) { specValueVO.setSpecName(entry.getKey()); - if (entry.getValue().toString().contains("url")) { - List specImages = JSONUtil.toList(JSONUtil.parseArray(entry.getValue()), - SpecValueVO.SpecImages.class); - specValueVO.setSpecImage(specImages); - goodsGalleryList = - specImages.stream().map(SpecValueVO.SpecImages::getUrl).collect(Collectors.toList()); - } + List specImages = JSONUtil.toList(JSONUtil.parseArray(entry.getValue()), + String.class); + specValueVO.setSpecImage(specImages); + goodsGalleryList = new ArrayList<>(specImages); } else { specValueVO.setSpecName(entry.getKey()); specValueVO.setSpecValue(entry.getValue().toString());