* 商品详情接口bug修复

src/main/java/com/tdba/cxb/ares/api/model/ProductAttrValueVo.java

@@ -32,6 +32,9 @@ public class ProductAttrValueVo {
     /** 属性值列表*/
     private List<String> value_list;
 
+    /** 养老金*/
+    private BigDecimal annuity = BigDecimal.ZERO;
+
     public List<String> getValue_list() {
         return value_list;
     }
@@ -79,4 +82,12 @@ public class ProductAttrValueVo {
     public void setUnique(String unique) {
         this.unique = unique;
     }
+
+    public BigDecimal getAnnuity() {
+        return annuity;
+    }
+
+    public void setAnnuity(BigDecimal annuity) {
+        this.annuity = annuity;
+    }
 }

src/main/java/com/tdba/cxb/ares/api/model/ProductSimple.java

@@ -17,7 +17,7 @@ public class ProductSimple {
     private String name;
 
     /** 养老金*/
-    private BigDecimal annuity;
+    private BigDecimal annuity = BigDecimal.ZERO;
 
     /** 价格*/
     private BigDecimal price;

src/main/java/com/tdba/cxb/ares/api/model/ProductVo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JacksonAnnotation;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -30,9 +31,6 @@ public class ProductVo {
     /** 商品名称*/
     private String name;
 
-    /** 养老金*/
-    private BigDecimal annuity;
-
     /** 详情介绍HTML源码*/
     private String content;
 
@@ -43,6 +41,28 @@ public class ProductVo {
     /** 轮播图列表*/
     private List<String> slider_image_list;
 
+    /** 商品类型：1：普通商品。2：爆款商品。3：消费积分商品 。5：会员专享商品（城中大仓）6：每日免费领商品'*/
+    private Integer type;
+
+    /** 是否秒杀 1是  0不是*/
+    private Integer seckill;
+
+    public Integer getSeckill() {
+        return seckill;
+    }
+
+    public void setSeckill(Integer seckill) {
+        this.seckill = seckill;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     public Integer getId() {
         return id;
     }
@@ -83,14 +103,6 @@ public class ProductVo {
         this.name = name;
     }
 
-    public BigDecimal getAnnuity() {
-        return annuity;
-    }
-
-    public void setAnnuity(BigDecimal annuity) {
-        this.annuity = annuity;
-    }
-
     public String getContent() {
         return content;
     }

src/main/java/com/tdba/cxb/ares/api/model/TDBAResponseBuilder.java

@@ -13,7 +13,7 @@ public class TDBAResponseBuilder {
      * @return
      */
     public static TDBAResponse buildSuccess(Object data) {
-        return build(data, "success", "0");
+        return build(data, "success", "200");
     }
 
     /**

src/main/resources/mapper/ProductMapper.xml

@@ -12,7 +12,9 @@
             stock,
             store_info 'info',
             store_name 'name',
-            mer_id
+            mer_id,
+            type,
+            seckill
         from
             rrx_store_product
         where