From fac8dcce1d2cad6728270b436952f818378fc6ea Mon Sep 17 00:00:00 2001
From: 喻健 <Administrator@Admin>
Date: 星期二, 25 十二月 2018 15:12:32 +0800
Subject: [PATCH] 订单状态调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 019c260..9284848 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -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;
--
Gitblit v1.8.0