|
@@ -1,9 +1,12 @@
|
|
|
package com.etotem.cfc.dto;
|
|
package com.etotem.cfc.dto;
|
|
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.etotem.cfc.entity.Product;
|
|
import com.etotem.cfc.entity.Product;
|
|
|
import lombok.Data;
|
|
import lombok.Data;
|
|
|
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
|
|
+import java.util.List;
|
|
|
|
|
|
|
|
@Data
|
|
@Data
|
|
|
public class ProductDTO {
|
|
public class ProductDTO {
|
|
@@ -23,6 +26,7 @@ public class ProductDTO {
|
|
|
private String status;
|
|
private String status;
|
|
|
private String domain;
|
|
private String domain;
|
|
|
private String memberEligible;
|
|
private String memberEligible;
|
|
|
|
|
+ private List<String> imageList;
|
|
|
private Long energyDimensionId;
|
|
private Long energyDimensionId;
|
|
|
private String priceLabel; // 游客 = "登录查看价格",登录后 = null
|
|
private String priceLabel; // 游客 = "登录查看价格",登录后 = null
|
|
|
private Date createdAt;
|
|
private Date createdAt;
|
|
@@ -41,6 +45,15 @@ public class ProductDTO {
|
|
|
d.intro = p.getIntro();
|
|
d.intro = p.getIntro();
|
|
|
d.coverImage = p.getCoverImage();
|
|
d.coverImage = p.getCoverImage();
|
|
|
d.images = p.getImages();
|
|
d.images = p.getImages();
|
|
|
|
|
+ if (p.getImages() != null && !p.getImages().isEmpty()) {
|
|
|
|
|
+ try {
|
|
|
|
|
+ d.imageList = JSON.parseArray(p.getImages(), String.class);
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ d.imageList = new ArrayList<>();
|
|
|
|
|
+ }
|
|
|
|
|
+ } else {
|
|
|
|
|
+ d.imageList = new ArrayList<>();
|
|
|
|
|
+ }
|
|
|
d.price = p.getPrice();
|
|
d.price = p.getPrice();
|
|
|
d.memberPrice = p.getMemberPrice();
|
|
d.memberPrice = p.getMemberPrice();
|
|
|
d.stock = p.getStock();
|
|
d.stock = p.getStock();
|