From d88c167fc5973a2c15ff1539e4cdab36e4a7842c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 28 八月 2019 14:47:15 +0800
Subject: [PATCH] 奖励券使用区分订单下单三方日期
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java | 67 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java
index 89d06d5..af70360 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java
@@ -6,7 +6,7 @@
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
-import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.google.gson.annotations.Expose;
/**
* 鍟嗗搧鍒嗙被
@@ -21,16 +21,29 @@
*
*/
private static final long serialVersionUID = 1L;
+
+ public final static int SEX_DEFAULT = 0; // 閫氱敤
+ public final static int SEX_WOMAN = 1; // 濂�
+ public final static int SEX_MAN = 2; // 鐢�
+ public final static int SEX_DEFAULT_WOMAN = 10; // 濂�+ 閫氱敤
+ public final static int SEX_DEFAULT_MAN = 20; // 鐢�+ 閫氱敤
+ public final static int SEX_MAN_WOMAN = 12; // 鐢�+ 濂�
+
+ public final static int SEX_ALL = 120; // 鐢�+ 濂� + 閫氱敤
+ @Expose
@Column(name = "id")
private Long id;
+ @Expose
@Column(name = "name")
private String name;
+ @Expose
@Column(name = "picture")
private String picture;
+ @Expose
@Column(name = "url")
private String url;
@@ -52,14 +65,33 @@
@Column(name = "android_click")
private Long androidClick;
+ // 鐘舵��
+ @Column(name = "cs_state")
+ private Integer state;
+ @Column(name = "sex")
+ private Integer sex;//鐢峰コ 0-閮ㄥ垎鐢峰コ 1-鐢� 2-濂�
+
+
+ public Integer getSex() {
+ return sex;
+ }
+
+ public void setSex(Integer sex) {
+ this.sex = sex;
+ }
+
// 鐐瑰嚮娆℃暟
private Long countClick = 0l;
// 鍏宠仈鏍囩鏁伴噺
private int countlabel = 0;
- // 绯荤粺鍏宠仈鍒楄〃
- private List<BusinessSystem> systemList;
+ private String taobaoCids;
+
+ // 鍔ㄦ�佷簩绾у晢鍝佸垎绫�
+ @Expose
+ private List<GoodsClass> listSub;
+
public GoodsClass() {
}
@@ -67,6 +99,11 @@
public GoodsClass(Long id) {
super();
this.id = id;
+ }
+
+ public GoodsClass(Long id, String name) {
+ this.id = id;
+ this.name = name;
}
public GoodsClass(String name, String picture, Integer orderby, Long createtime) {
@@ -173,12 +210,28 @@
this.countlabel = countlabel;
}
- public List<BusinessSystem> getSystemList() {
- return systemList;
+ public Integer getState() {
+ return state;
}
- public void setSystemList(List<BusinessSystem> systemList) {
- this.systemList = systemList;
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public String getTaobaoCids() {
+ return taobaoCids;
+ }
+
+ public void setTaobaoCids(String taobaoCids) {
+ this.taobaoCids = taobaoCids;
+ }
+
+ public List<GoodsClass> getListSub() {
+ return listSub;
+ }
+
+ public void setListSub(List<GoodsClass> listSub) {
+ this.listSub = listSub;
}
}
--
Gitblit v1.8.0