fanli-server.git

			@@ -9,6 +9,7 @@

			import com.google.gson.annotations.Expose;
			import com.yeshi.fanli.entity.order.CommonOrder;
			import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

			/**
			* 订单-简版
			@@ -21,52 +22,150 @@
			public class CommonOrderVO extends CommonOrder implements Serializable {

			private static final long serialVersionUID = 1L;

			// 到账时间
			private Date accountTime;
			// 预计到账时间
			private Date preAccountTime;
			// 实际总数量
			private Integer totalCount;
			// 实际总付款
			private BigDecimal totalSettlement;
			// 红包类型：
			private Integer hongBaoType;
			// 订单总预估奖金
			private BigDecimal hongBao;


			// 红包状态
			@Expose
			private Integer hongBaoState;
			// 到账时间
			@Expose
			private String hongBaoDate;

			// 到账时间
			private Date accountTime;
			// 预计到账时间
			private Date preAccountTime;
			// 实际总数量
			private Integer totalCount;
			// 实际总付款
			private BigDecimal totalPayment;
			// 实际总结算
			private BigDecimal totalSettlement;
			// 红包类型：
			private Integer hongBaoType;
			// 订单总预估奖金
			private BigDecimal hongBao;

			// 券红包金额
			@Expose
			private BigDecimal couponMoney;
			// 1 淘宝 2 天猫
			@Expose
			private Integer orderType;
			// 红包状态
			@Expose
			private Integer hongBaoState;
			// 到账时间
			@Expose
			private String hongBaoDate;
			// 红包类型图片链接
			@Expose
			private String hongBaoTypePic;
			@Expose
			private String hongBaoTypePic;
			// 订单产生的方式: 自购分享邀请
			@Expose
			private String orderOrigin;
			// 订单状态
			@Expose
			private Map<String, String> orderState;
			// 红包金额
			@Expose
			private Map<String, String> hongBaoInfo;
			@Expose
			private Map<String, String> orderState;
			// 红包金额
			@Expose
			private Map<String, String> hongBaoInfo;
			// 到账状态
			@Expose
			private String accountState;
			// 创建时间数字格式
			@Expose
			private Long obtainTime;
			// 下单时间
			@Expose
			private String downTime;
			// 收货时间
			@Expose
			private String receiveTime;
			// 订单下的商品
			@Expose
			@Expose
			private Map<String, String> accountState;
			// 创建时间数字格式
			@Expose
			private Long obtainTime;
			// 下单时间
			@Expose
			private String downTime;
			// 收货时间
			@Expose
			private String receiveTime;
			// 订单下的商品
			@Expose
			private List<CommonOrderGoodsVO> listOrderGoods = new ArrayList<CommonOrderGoodsVO>();

			// 订单状态列表
			@Expose
			private List<String> signList;
			// 收货时间
			@Expose
			private Map<String, Object> rewardDetail;

			// 维权信息
			@Expose
			private WeiQuanInfo weiQuanInfo;

			// 补贴信息
			@Expose
			private ClientTextStyleVO subsidy;
			// 补贴解释信息
			@Expose
			private List<String> subsidyList;

			// 直接收益人-ID
			private String userId;
			// 直接收益人-昵称
			private String userName;
			// 直接收益人-头像
			private String userPortrait; // 头像

			// 红包ID
			private Long hongbaoId;

			// 一级收益人-ID
			private String levelOneId;
			// 一级收益人-金额
			private String levelOneMoney;

			// 二级收益人-ID
			private String levelTwoId;
			// 二级收益人-金额
			private String levelTwoMoney;

			private String weiQuanState;// 维权状态

			private String weiQuanBackMoney;// 维权资金

			private Integer otherState; // 1免单

			@Expose
			private boolean vipOrder;// 是否为超级用户订单(2.1之后废弃)

			@Expose
			private String vipOrderDesc;// 超级订单描述(2.1之后废弃)

			@Expose
			private String rebateLink;// 返利说明链接

			@Expose
			private String orderDesc;// 订单描述


			public String getVipOrderDesc() {
			return vipOrderDesc;
			}

			public void setVipOrderDesc(String vipOrderDesc) {
			this.vipOrderDesc = vipOrderDesc;
			}

			public boolean isVipOrder() {
			return vipOrder;
			}

			public void setVipOrder(boolean vipOrder) {
			this.vipOrder = vipOrder;
			}

			public String getWeiQuanState() {
			return weiQuanState;
			}

			public void setWeiQuanState(String weiQuanState) {
			this.weiQuanState = weiQuanState;
			}

			public String getWeiQuanBackMoney() {
			return weiQuanBackMoney;
			}

			public void setWeiQuanBackMoney(String weiQuanBackMoney) {
			this.weiQuanBackMoney = weiQuanBackMoney;
			}

			public Date getAccountTime() {
			return accountTime;
			@@ -123,7 +222,6 @@
			public void setReceiveTime(String receiveTime) {
			this.receiveTime = receiveTime;
			}


			public List<CommonOrderGoodsVO> getListOrderGoods() {
			return listOrderGoods;
			@@ -189,13 +287,172 @@
			this.hongBaoDate = hongBaoDate;
			}

			public String getAccountState() {
			public Integer getOrderType() {
			return orderType;
			}

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

			public Map<String, String> getAccountState() {
			return accountState;
			}

			public void setAccountState(String accountState) {
			public void setAccountState(Map<String, String> accountState) {
			this.accountState = accountState;
			}


			public String getOrderOrigin() {
			return orderOrigin;
			}

			public void setOrderOrigin(String orderOrigin) {
			this.orderOrigin = orderOrigin;
			}

			public BigDecimal getTotalPayment() {
			return totalPayment;
			}

			public void setTotalPayment(BigDecimal totalPayment) {
			this.totalPayment = totalPayment;
			}

			public String getLevelOneId() {
			return levelOneId;
			}

			public void setLevelOneId(String levelOneId) {
			this.levelOneId = levelOneId;
			}

			public String getLevelOneMoney() {
			return levelOneMoney;
			}

			public void setLevelOneMoney(String levelOneMoney) {
			this.levelOneMoney = levelOneMoney;
			}

			public String getLevelTwoId() {
			return levelTwoId;
			}

			public void setLevelTwoId(String levelTwoId) {
			this.levelTwoId = levelTwoId;
			}

			public String getLevelTwoMoney() {
			return levelTwoMoney;
			}

			public void setLevelTwoMoney(String levelTwoMoney) {
			this.levelTwoMoney = levelTwoMoney;
			}

			public String getUserId() {
			return userId;
			}

			public void setUserId(String userId) {
			this.userId = userId;
			}

			public String getUserName() {
			return userName;
			}

			public void setUserName(String userName) {
			this.userName = userName;
			}

			public String getUserPortrait() {
			return userPortrait;
			}

			public void setUserPortrait(String userPortrait) {
			this.userPortrait = userPortrait;
			}

			public Map<String, Object> getRewardDetail() {
			return rewardDetail;
			}

			public void setRewardDetail(Map<String, Object> rewardDetail) {
			this.rewardDetail = rewardDetail;
			}

			public List<String> getSignList() {
			return signList;
			}

			public void setSignList(List<String> signList) {
			this.signList = signList;
			}

			public BigDecimal getCouponMoney() {
			return couponMoney;
			}

			public void setCouponMoney(BigDecimal couponMoney) {
			this.couponMoney = couponMoney;
			}

			public Long getHongbaoId() {
			return hongbaoId;
			}

			public void setHongbaoId(Long hongbaoId) {
			this.hongbaoId = hongbaoId;
			}

			public Integer getOtherState() {
			return otherState;
			}

			public void setOtherState(Integer otherState) {
			this.otherState = otherState;
			}

			public WeiQuanInfo getWeiQuanInfo() {
			return weiQuanInfo;
			}

			public void setWeiQuanInfo(WeiQuanInfo weiQuanInfo) {
			this.weiQuanInfo = weiQuanInfo;
			}

			public ClientTextStyleVO getSubsidy() {
			return subsidy;
			}

			public void setSubsidy(ClientTextStyleVO subsidy) {
			this.subsidy = subsidy;
			}

			public List<String> getSubsidyList() {
			return subsidyList;
			}

			public void setSubsidyList(List<String> subsidyList) {
			this.subsidyList = subsidyList;
			}

			public String getOrderDesc() {
			return orderDesc;
			}

			public void setOrderDesc(String orderDesc) {
			this.orderDesc = orderDesc;
			}

			public String getRebateLink() {
			return rebateLink;
			}

			public void setRebateLink(String rebateLink) {
			this.rebateLink = rebateLink;
			}

			}