From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBriefExtra.java | 99 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 97 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBriefExtra.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBriefExtra.java
index 7bd1196..1b8a0c2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBriefExtra.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBriefExtra.java
@@ -1,11 +1,19 @@
package com.yeshi.fanli.entity.taobao;
import java.math.BigDecimal;
+import java.util.List;
import com.google.gson.annotations.Expose;
+import com.yeshi.fanli.vo.goods.taobao.TLJBuyHongBaoVO;
+import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
public class TaoBaoGoodsBriefExtra extends TaoBaoGoodsBrief {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
@Expose
private boolean baoyou;
@Expose
@@ -21,8 +29,72 @@
@Expose
private String tbToken;
@Expose
- private int collected; // 0-娌℃湁鏀惰棌 1-宸叉敹钘�
+ private int collected; // 0-娌℃湁鏀惰棌 1-宸叉敹钘�
+
+ @Expose
+ private int moneyType;// 璧勯噾绫诲瀷 1-杩� 2-濂�
+
+ @Expose
+ private List<ClientTextStyleVO> labels;////鏍囩
+
+ @Expose
+ private int salesType;//閿�閲忕被鍨�:1-鏈堥攢閲� 2-2灏忔椂閿�閲� 3-浠婃棩閿�閲�
+
+ @Expose
+ private boolean coupon; // 鏄惁鏈夊埜
+
+ @Expose
+ private boolean recommend; // 鏄惁鎺ㄨ崘
+
+ @Expose
+ private String spreadMoney;// 鎺ㄥ箍绾㈠寘
+
+ @Expose
+ private TLJBuyHongBaoVO tljBuyHongBao;
+
+ @Expose
+ private ClientTextStyleVO pictureTag;
+
+ public ClientTextStyleVO getPictureTag() {
+ return pictureTag;
+ }
+
+ public void setPictureTag(ClientTextStyleVO pictureTag) {
+ this.pictureTag = pictureTag;
+ }
+
+ public TLJBuyHongBaoVO getTljBuyHongBao() {
+ return tljBuyHongBao;
+ }
+
+ public void setTljBuyHongBao(TLJBuyHongBaoVO tljBuyHongBao) {
+ this.tljBuyHongBao = tljBuyHongBao;
+ }
+
+ public int getMoneyType() {
+ return moneyType;
+ }
+
+ public void setMoneyType(int moneyType) {
+ this.moneyType = moneyType;
+ }
+
+ public List<ClientTextStyleVO> getLabels() {
+ return labels;
+ }
+
+ public void setLabels(List<ClientTextStyleVO> labels) {
+ this.labels = labels;
+ }
+
+ public int getSalesType() {
+ return salesType;
+ }
+
+ public void setSalesType(int salesType) {
+ this.salesType = salesType;
+ }
public String getTbToken() {
return tbToken;
@@ -88,5 +160,28 @@
this.collected = collected;
}
-
+ public boolean isCoupon() {
+ return coupon;
+ }
+
+ public void setCoupon(boolean coupon) {
+ this.coupon = coupon;
+ }
+
+ public boolean isRecommend() {
+ return recommend;
+ }
+
+ public void setRecommend(boolean recommend) {
+ this.recommend = recommend;
+ }
+
+ public String getSpreadMoney() {
+ return spreadMoney;
+ }
+
+ public void setSpreadMoney(String spreadMoney) {
+ this.spreadMoney = spreadMoney;
+ }
+
}
--
Gitblit v1.8.0