fanli-server.git

			@@ -7,104 +7,107 @@

			/**
			* 订单
			*
			* @author Administrator
			*
			* @author Administrator
			*/
			@org.yeshi.utils.mybatis.Table("yeshi_ec_order")
			public class Order {
			// 订单状状态 -1：失效 0-未支付 1-已支付
			public final static int STATE_SHIXIAO = -1;
			public final static int STATE_WEIZHIFU = 0;
			public final static int STATE_YIZHIFU = 1;
			// 订单状状态 -1：失效 0-未支付 1-已支付
			public final static int STATE_SHIXIAO = -1;
			public final static int STATE_WEIZHIFU = 0;
			public final static int STATE_YIZHIFU = 1;

			public final static int ORDER_TYPE_TAOBAO = 1;// 淘宝
			public final static int ORDER_TYPE_JINGDONG = 2;// 京东
			public final static int ORDER_TYPE_PDD = 3;// 拼多多
			public final static int ORDER_TYPE_TAOBAO = 1;// 淘宝
			public final static int ORDER_TYPE_JINGDONG = 2;// 京东
			public final static int ORDER_TYPE_PDD = 3;// 拼多多

			@org.yeshi.utils.mybatis.Column(name = "id")
			@Expose
			private Long id;
			@org.yeshi.utils.mybatis.Column(name = "id")
			@Expose
			private Long id;

			@org.yeshi.utils.mybatis.Column(name = "orderid")
			@Expose
			private String orderId;// 订单编号
			@org.yeshi.utils.mybatis.Column(name = "orderid")
			@Expose
			private String orderId;// 订单编号

			@org.yeshi.utils.mybatis.Column(name = "order_type")
			@Expose
			private Integer orderType;// 订单类型 1-淘宝 2-京东
			@org.yeshi.utils.mybatis.Column(name = "order_type")
			@Expose
			private Integer orderType;// 订单类型 1-淘宝 2-京东

			@org.yeshi.utils.mybatis.Column(name = "state")
			@Expose
			private Integer state;// 订单状�? -1：失效0-未支付?1-已支负
			@org.yeshi.utils.mybatis.Column(name = "state")
			@Expose
			private Integer state;// 订单状态 -1：失效0-未支付?1-已支负

			@org.yeshi.utils.mybatis.Column(name = "drawback_time")
			@Expose
			private Long drawbackTime;// 退款时间
			@org.yeshi.utils.mybatis.Column(name = "state_desc")
			@Expose
			private String stateDesc;//订单描述

			@org.yeshi.utils.mybatis.Column(name = "createtime")
			@Expose
			private Long createtime;// 创建时间付款时间
			@org.yeshi.utils.mybatis.Column(name = "drawback_time")
			@Expose
			private Long drawbackTime;// 退款时间

			@org.yeshi.utils.mybatis.Column(name = "uid")
			@Expose
			private UserInfo userInfo;
			@org.yeshi.utils.mybatis.Column(name = "createtime")
			@Expose
			private Long createtime;// 创建时间付款时间

			@org.yeshi.utils.mybatis.Column(name = "beizhu")
			@Expose
			private String beizhu;
			@org.yeshi.utils.mybatis.Column(name = "uid")
			@Expose
			private UserInfo userInfo;

			@org.yeshi.utils.mybatis.Column(name = "money")
			@Expose
			private BigDecimal money;
			@org.yeshi.utils.mybatis.Column(name = "beizhu")
			@Expose
			private String beizhu;

			// 第三方订单创建时间
			@org.yeshi.utils.mybatis.Column(name = "third_createtime")
			@Expose
			private Date thirdCreateTime;
			@org.yeshi.utils.mybatis.Column(name = "money")
			@Expose
			private BigDecimal money;

			// 第三方订单状态
			@org.yeshi.utils.mybatis.Column(name = "third_state")
			@Expose
			private String thirdState;
			// 第三方订单创建时间
			@org.yeshi.utils.mybatis.Column(name = "third_createtime")
			@Expose
			private Date thirdCreateTime;

			public Date getThirdCreateTime() {
			return thirdCreateTime;
			}
			// 第三方订单状态
			@org.yeshi.utils.mybatis.Column(name = "third_state")
			@Expose
			private String thirdState;

			public void setThirdCreateTime(Date thirdCreateTime) {
			this.thirdCreateTime = thirdCreateTime;
			}
			public Date getThirdCreateTime() {
			return thirdCreateTime;
			}

			public String getThirdState() {
			return thirdState;
			}
			public void setThirdCreateTime(Date thirdCreateTime) {
			this.thirdCreateTime = thirdCreateTime;
			}

			public void setThirdState(String thirdState) {
			this.thirdState = thirdState;
			}
			public String getThirdState() {
			return thirdState;
			}

			/**
			* 版本： 1（1.2.3v之前）2:之后
			*/
			@org.yeshi.utils.mybatis.Column(name = "version")
			private Integer version;
			public void setThirdState(String thirdState) {
			this.thirdState = thirdState;
			}

			public Order() {
			money = BigDecimal.valueOf(0);
			}
			/**
			* 版本： 1（1.2.3v之前）2:之后
			*/
			@org.yeshi.utils.mybatis.Column(name = "version")
			private Integer version;

			public BigDecimal getMoney() {
			return money;
			}
			public Order() {
			money = BigDecimal.valueOf(0);
			}

			public void setMoney(BigDecimal money) {
			this.money = money;
			}
			public BigDecimal getMoney() {
			return money;
			}

			public Long getId() {
			return id;
			}
			public void setMoney(BigDecimal money) {
			this.money = money;
			}

			public Long getId() {
			return id;
			}

			// public List<OrderItem> getOrderItemList() {
			// return orderItemList;
			@@ -114,72 +117,80 @@
			// this.orderItemList = orderItemList;
			//}

			public void setId(Long id) {
			this.id = id;
			}
			public String getStateDesc() {
			return stateDesc;
			}

			public String getOrderId() {
			return orderId;
			}
			public void setStateDesc(String stateDesc) {
			this.stateDesc = stateDesc;
			}

			public void setOrderId(String orderId) {
			this.orderId = orderId;
			}
			public void setId(Long id) {
			this.id = id;
			}

			public Integer getOrderType() {
			return orderType;
			}
			public String getOrderId() {
			return orderId;
			}

			public void setOrderType(Integer orderType) {
			this.orderType = orderType;
			}
			public void setOrderId(String orderId) {
			this.orderId = orderId;
			}

			public Integer getState() {
			return state;
			}
			public Integer getOrderType() {
			return orderType;
			}

			public void setState(Integer state) {
			this.state = state;
			}
			public void setOrderType(Integer orderType) {
			this.orderType = orderType;
			}

			public Long getDrawbackTime() {
			return drawbackTime;
			}
			public Integer getState() {
			return state;
			}

			public void setDrawbackTime(Long drawbackTime) {
			this.drawbackTime = drawbackTime;
			}
			public void setState(Integer state) {
			this.state = state;
			}

			public Long getCreatetime() {
			return createtime;
			}
			public Long getDrawbackTime() {
			return drawbackTime;
			}

			public void setCreatetime(Long createtime) {
			this.createtime = createtime;
			}
			public void setDrawbackTime(Long drawbackTime) {
			this.drawbackTime = drawbackTime;
			}

			public UserInfo getUserInfo() {
			return userInfo;
			}
			public Long getCreatetime() {
			return createtime;
			}

			public void setUserInfo(UserInfo userInfo) {
			this.userInfo = userInfo;
			}
			public void setCreatetime(Long createtime) {
			this.createtime = createtime;
			}

			public String getBeizhu() {
			return beizhu;
			}
			public UserInfo getUserInfo() {
			return userInfo;
			}

			public void setBeizhu(String beizhu) {
			this.beizhu = beizhu;
			}
			public void setUserInfo(UserInfo userInfo) {
			this.userInfo = userInfo;
			}

			public Integer getVersion() {
			return version;
			}
			public String getBeizhu() {
			return beizhu;
			}

			public void setVersion(Integer version) {
			this.version = version;
			}
			public void setBeizhu(String beizhu) {
			this.beizhu = beizhu;
			}

			public Integer getVersion() {
			return version;
			}

			public void setVersion(Integer version) {
			this.version = version;
			}

			}