fix: 优化商品图片地址存储结构,只保留图片地址,去除其他无效参数,优化商品图片规则,改为全部通用spu图片,可为第一个 规格项 单独设置一个图片。
This commit is contained in:
parent
6755515b1f
commit
ee8f5b6e1e
@ -7,7 +7,6 @@ import lombok.Data;
|
|||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 商品导入DTO
|
* 商品导入DTO
|
||||||
@ -36,7 +35,7 @@ public class GoodsImportDTO {
|
|||||||
private Boolean release;
|
private Boolean release;
|
||||||
|
|
||||||
@ApiModelProperty(value = "商品图片")
|
@ApiModelProperty(value = "商品图片")
|
||||||
private List<Map<String, String>> images;
|
private List<String> images;
|
||||||
private List<String> goodsGalleryList;
|
private List<String> goodsGalleryList;
|
||||||
|
|
||||||
@ApiModelProperty(value = "成本价")
|
@ApiModelProperty(value = "成本价")
|
||||||
|
@ -32,18 +32,5 @@ public class SpecValueVO implements Serializable {
|
|||||||
* 规格图片
|
* 规格图片
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "规格的图片")
|
@ApiModelProperty(value = "规格的图片")
|
||||||
private List<SpecImages> specImage;
|
private List<String> specImage;
|
||||||
|
|
||||||
@Data
|
|
||||||
public static class SpecImages implements Serializable {
|
|
||||||
|
|
||||||
private static final long serialVersionUID = 1816357809660916086L;
|
|
||||||
|
|
||||||
private String url;
|
|
||||||
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
private String status;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,9 @@ import javax.servlet.http.HttpServletResponse;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.net.URLEncoder;
|
import java.net.URLEncoder;
|
||||||
import java.util.*;
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
@ -203,15 +205,11 @@ public class GoodsImportServiceImpl implements GoodsImportService {
|
|||||||
goodsImportDTO.setCategory(category);
|
goodsImportDTO.setCategory(category);
|
||||||
goodsImportDTO.setTemplate(templateId);
|
goodsImportDTO.setTemplate(templateId);
|
||||||
goodsImportDTO.setGoodsUnit(objects.get(4).toString().substring(objects.get(4).toString().indexOf("-") + 1));
|
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<Map<String, String>> images = new ArrayList<>();
|
|
||||||
List<String> goodsGalleryList = new ArrayList<>();
|
List<String> goodsGalleryList = new ArrayList<>();
|
||||||
Map<String, String> map = new HashMap<>();
|
|
||||||
map.put("url", objects.get(6).toString());
|
|
||||||
images.add(map);
|
|
||||||
goodsGalleryList.add(objects.get(6).toString());
|
goodsGalleryList.add(objects.get(6).toString());
|
||||||
goodsImportDTO.setImages(images);
|
goodsImportDTO.setImages(goodsGalleryList);
|
||||||
goodsImportDTO.setGoodsGalleryList(goodsGalleryList);
|
goodsImportDTO.setGoodsGalleryList(goodsGalleryList);
|
||||||
|
|
||||||
goodsImportDTO.setCost(Convert.toDouble(objects.get(7)));
|
goodsImportDTO.setCost(Convert.toDouble(objects.get(7)));
|
||||||
|
@ -334,6 +334,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
goodsSkuDetail.getGoodsGalleryList().addAll(goodsVO.getGoodsGalleryList());
|
||||||
map.put("data", goodsSkuDetail);
|
map.put("data", goodsSkuDetail);
|
||||||
|
|
||||||
//获取分类
|
//获取分类
|
||||||
@ -474,13 +475,10 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
|
|||||||
SpecValueVO specValueVO = new SpecValueVO();
|
SpecValueVO specValueVO = new SpecValueVO();
|
||||||
if ("images".equals(entry.getKey())) {
|
if ("images".equals(entry.getKey())) {
|
||||||
specValueVO.setSpecName(entry.getKey());
|
specValueVO.setSpecName(entry.getKey());
|
||||||
if (entry.getValue().toString().contains("url")) {
|
List<String> specImages = JSONUtil.toList(JSONUtil.parseArray(entry.getValue()),
|
||||||
List<SpecValueVO.SpecImages> specImages = JSONUtil.toList(JSONUtil.parseArray(entry.getValue()),
|
String.class);
|
||||||
SpecValueVO.SpecImages.class);
|
specValueVO.setSpecImage(specImages);
|
||||||
specValueVO.setSpecImage(specImages);
|
goodsGalleryList = new ArrayList<>(specImages);
|
||||||
goodsGalleryList =
|
|
||||||
specImages.stream().map(SpecValueVO.SpecImages::getUrl).collect(Collectors.toList());
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
specValueVO.setSpecName(entry.getKey());
|
specValueVO.setSpecName(entry.getKey());
|
||||||
specValueVO.setSpecValue(entry.getValue().toString());
|
specValueVO.setSpecValue(entry.getValue().toString());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user