From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java | 182 ++++++++++++++++++++++++++++-----------------
1 files changed, 112 insertions(+), 70 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 749f84e..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
@@ -3,75 +3,110 @@
import java.io.Serializable;
import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+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;
/**
* 鍟嗗搧鍒嗙被
*
* @author Administrator
*
- *
*/
-@Entity
-@Table(name = "yeshi_ec_class")
-public class GoodsClass implements Serializable{
+@Table("yeshi_ec_class")
+public class GoodsClass implements Serializable {
+
/**
*
*/
private static final long serialVersionUID = 1L;
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "id")
- private long id;
- @Column(name = "`name`", length = 50)
+ 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;
- @Column(name = "`picture`", length = 1024)
+ @Expose
+ @Column(name = "picture")
private String picture;
+ @Expose
+ @Column(name = "url")
private String url;
- @Column(name = "`key`", length = 50)
+ @Column(name = "key")
private String key;
-
- @Column(name = "`search_param`", length = 1024)
+ @Column(name = "search_param")
private String searchParam;
-// @Column(name = "`tbcates`", length = 1024)
-// private String tbCates;
-
- private int orderby;
+ @Column(name = "orderby")
+ private Integer orderby;
- private long createtime;
+ @Column(name = "createtime")
+ private Long createtime;
@Column(name = "ios_click")
- private Long iosClick = 0l;
+ private Long iosClick;
@Column(name = "android_click")
- private Long androidClick = 0l;
+ private Long androidClick;
- @Transient // 鐐瑰嚮娆℃暟
+ // 鐘舵��
+ @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;
-
- @Transient // 鍏宠仈鏍囩鏁伴噺
+ // 鍏宠仈鏍囩鏁伴噺
private int countlabel = 0;
+
+ private String taobaoCids;
- @Transient // 绯荤粺鍏宠仈鍒楄〃
- private List<BusinessSystem> systemList;
+ // 鍔ㄦ�佷簩绾у晢鍝佸垎绫�
+ @Expose
+ private List<GoodsClass> listSub;
+
+
+ public GoodsClass() {
+ }
+ public GoodsClass(Long id) {
+ super();
+ this.id = id;
+ }
- public GoodsClass(String name, String picture, int orderby, long createtime) {
+ public GoodsClass(Long id, String name) {
+ this.id = id;
+ this.name = name;
+ }
+
+ public GoodsClass(String name, String picture, Integer orderby, Long createtime) {
super();
this.name = name;
this.picture = picture;
@@ -79,19 +114,11 @@
this.createtime = createtime;
}
- public GoodsClass() {
- }
-
- public GoodsClass(long id) {
- super();
- this.id = id;
- }
-
- public long getId() {
+ public Long getId() {
return id;
}
- public void setId(long id) {
+ public void setId(Long id) {
this.id = id;
}
@@ -101,14 +128,6 @@
public void setName(String name) {
this.name = name;
- }
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
}
public String getPicture() {
@@ -127,19 +146,35 @@
this.url = url;
}
- public int getOrderby() {
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getSearchParam() {
+ return searchParam;
+ }
+
+ public void setSearchParam(String searchParam) {
+ this.searchParam = searchParam;
+ }
+
+ public Integer getOrderby() {
return orderby;
}
- public void setOrderby(int orderby) {
+ public void setOrderby(Integer orderby) {
this.orderby = orderby;
}
- public long getCreatetime() {
+ public Long getCreatetime() {
return createtime;
}
- public void setCreatetime(long createtime) {
+ public void setCreatetime(Long createtime) {
this.createtime = createtime;
}
@@ -167,14 +202,6 @@
this.countClick = countClick;
}
- public List<BusinessSystem> getSystemList() {
- return systemList;
- }
-
- public void setSystemList(List<BusinessSystem> systemList) {
- this.systemList = systemList;
- }
-
public int getCountlabel() {
return countlabel;
}
@@ -183,13 +210,28 @@
this.countlabel = countlabel;
}
- public String getSearchParam() {
- return searchParam;
+ public Integer getState() {
+ return state;
}
- public void setSearchParam(String searchParam) {
- this.searchParam = searchParam;
+ 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