fanli-server.git

			@@ -156,17 +156,6 @@
			order.setReceiveTime(format.format(settleTime));
			}

			Date accountTime = order.getAccountTime();
			if (accountTime != null) {
			order.setGetTime(formatday.format(accountTime));
			}

			Date preAccountTime = order.getPreAccountTime();
			if (preAccountTime != null) {
			order.setPreGetTime(formatday.format(preAccountTime));
			}


			/* 订单状态转换处理*/
			String orderStateContent = "";
			Map<String, String> orderStateMap = new HashMap<String, String>();
			@@ -232,29 +221,43 @@
			order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
			}


			String hongBaoDate = "";
			String hongBaoState_Str = "";
			String hongbaoInfoFontColor = "#E5005C";
			/* 红包状态转换 */
			String stateContent = "";
			Map<String, String> accountState = new HashMap<String, String>();
			Integer hongBaoState = order.getHongBaoState();
			if (HongBaoV2.STATE_KELINGQU == hongBaoState \|\| HongBaoV2.STATE_BUKELINGQU == hongBaoState) {
			stateContent = "未到账";
			hongBaoState_Str = "预估";
			hongbaoInfoFontColor = "#888888";

			Date preAccountTime = order.getPreAccountTime();
			if (preAccountTime != null) {
			hongBaoDate = "预计到账时间" + formatday.format(preAccountTime);
			}

			} else if (HongBaoV2.STATE_YILINGQU == hongBaoState) {
			stateContent = "已到账";

			Date accountTime = order.getAccountTime();
			if (accountTime != null) {
			hongBaoDate = "到账时间" + formatday.format(accountTime);
			}

			} else if (HongBaoV2.STATE_BUFENSHIXIAO == hongBaoState) {
			stateContent = "部分失效";
			stateContent = "部分失效";
			Date accountTime = order.getAccountTime();
			if (accountTime != null) {
			hongBaoDate = "到账时间" + formatday.format(accountTime);
			}

			} else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {
			stateContent = "已失效";
			stateContent = "已失效";
			hongBaoDate = " ";
			}
			accountState.put("content", stateContent);
			accountState.put("fontColor", "#E5005C");
			order.setAccountState(accountState);

			order.setAccountState(stateContent);
			order.setHongBaoDate(hongBaoDate);

			if ("奖金".equals(hongbaoInfo) && hongBaoState_Str.trim().length() > 0) {
			hongbaoInfo = hongBaoState_Str + hongbaoInfo;

			@@ -37,7 +37,9 @@
			// 红包状态
			private Integer hongBaoState;


			// 到账时间
			@Expose
			private String hongBaoDate;
			// 红包类型图片链接
			@Expose
			private String hongBaoTypePic;
			@@ -49,7 +51,7 @@
			private Map<String, String> hongBaoInfo;
			// 到账状态
			@Expose
			private Map<String, String> accountState;
			private String accountState;
			// 创建时间数字格式
			@Expose
			private Long obtainTime;
			@@ -59,12 +61,6 @@
			// 收货时间
			@Expose
			private String receiveTime;
			// 到账时间
			@Expose
			private String getTime;
			// 预计到账时间
			@Expose
			private String preGetTime;
			// 订单下的商品
			@Expose
			private List<CommonOrderGoodsVO> listOrderGoods = new ArrayList<CommonOrderGoodsVO>();
			@@ -126,21 +122,6 @@
			this.receiveTime = receiveTime;
			}

			public String getGetTime() {
			return getTime;
			}

			public void setGetTime(String getTime) {
			this.getTime = getTime;
			}

			public String getPreGetTime() {
			return preGetTime;
			}

			public void setPreGetTime(String preGetTime) {
			this.preGetTime = preGetTime;
			}

			public List<CommonOrderGoodsVO> getListOrderGoods() {
			return listOrderGoods;
			@@ -182,14 +163,6 @@
			this.hongBaoTypePic = hongBaoTypePic;
			}

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

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

			public Map<String, String> getHongBaoInfo() {
			return hongBaoInfo;
			}
			@@ -206,5 +179,21 @@
			this.orderState = orderState;
			}

			public String getHongBaoDate() {
			return hongBaoDate;
			}

			public void setHongBaoDate(String hongBaoDate) {
			this.hongBaoDate = hongBaoDate;
			}

			public String getAccountState() {
			return accountState;
			}

			public void setAccountState(String accountState) {
			this.accountState = accountState;
			}


			}

	fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java	41 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java	51 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史