fanli-server.git

			@@ -29,13 +29,20 @@
			// 实际总数量
			private Integer totalCount;
			// 实际总付款
			private BigDecimal totalSettlement;
			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;
			@@ -45,6 +52,9 @@
			// 红包类型图片链接
			@Expose
			private String hongBaoTypePic;
			// 订单: 自购分享邀请
			@Expose
			private String orderOrigin;
			// 订单状态
			@Expose
			private Map<String, String> orderState;
			@@ -53,7 +63,7 @@
			private Map<String, String> hongBaoInfo;
			// 到账状态
			@Expose
			private String accountState;
			private Map<String, String> accountState;
			// 创建时间数字格式
			@Expose
			private Long obtainTime;
			@@ -67,7 +77,34 @@
			@Expose
			private List<CommonOrderGoodsVO> listOrderGoods = new ArrayList<CommonOrderGoodsVO>();

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



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

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

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



			public Date getAccountTime() {
			return accountTime;
			}
			@@ -189,13 +226,118 @@
			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;
			}

			}