Browse Source

fix poster

guozhaoshun 6 years ago
parent
commit
2232e69783

+ 2 - 1
rankin-data-api/src/main/java/cn/rankin/data/api/product/dto/PosterDTO.java

@@ -2,6 +2,7 @@ package cn.rankin.data.api.product.dto;
 
 import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.common.utils.enums.ProductTypeEnum;
+import cn.rankin.data.api.product.entity.Product;
 import cn.rankin.data.api.user.entity.Merchant;
 import lombok.Data;
 import lombok.ToString;
@@ -31,7 +32,7 @@ public class PosterDTO implements Serializable {
 
     private Integer pageSize = 10;
 
-    private Map<String, Object> product;
+    private Product product;
 
     private Merchant merchant;
 

+ 1 - 1
rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Poster.java

@@ -56,7 +56,7 @@ public class Poster implements Serializable {
     private Date gmtModified;
 
     @Transient
-    private Map<String, Object> product;
+    private Product product;
 
     @Transient
     private Merchant merchant;

+ 1 - 2
rankin-data-api/src/main/java/cn/rankin/data/api/product/vo/PosterVo.java

@@ -9,7 +9,6 @@ import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.Map;
 
 @Data
 @ToString
@@ -33,7 +32,7 @@ public class PosterVo implements Serializable {
 
     private Date gmtModified;
 
-    private Map<String, Object> product;
+    private Product product;
 
     private Merchant merchant;
 

+ 1 - 1
rankin-product-service/src/main/java/cn/rankin/productservice/controller/PosterController.java

@@ -68,7 +68,7 @@ public class PosterController {
         }
 
 
-        Map<String, Object> product = productService.getProductDict(result.getPid());
+        Product product = productService.getProduct(result.getPid());
         result.setProduct(product);