fanli-server.git

			@@ -29,20 +29,29 @@
			// 实际总数量
			private Integer totalCount;
			// 实际总付款
			private BigDecimal totalSettlement;
			private BigDecimal totalPayment;
			// 实际总结算
			private BigDecimal totalSettlement;
			// 红包类型：
			private Integer hongBaoType;
			// 订单总预估奖金
			private BigDecimal hongBao;

			// 1 淘宝 2 天猫
			@Expose
			private Integer orderType;
			// 红包状态
			@Expose
			private Integer hongBaoState;

			// 到账时间
			@Expose
			private String hongBaoDate;
			// 红包类型图片链接
			@Expose
			private String hongBaoTypePic;
			// 订单: 自购分享邀请
			@Expose
			private String orderOrigin;
			// 订单状态
			@Expose
			private Map<String, String> orderState;
			@@ -51,7 +60,7 @@
			private Map<String, String> hongBaoInfo;
			// 到账状态
			@Expose
			private String accountState;
			private Map<String, String> accountState;
			// 创建时间数字格式
			@Expose
			private Long obtainTime;
			@@ -187,13 +196,38 @@
			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;
			}


			}