From dd865e62a9e687aeb2436a59a76bbe461bd83eaf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 27 十二月 2018 09:45:00 +0800
Subject: [PATCH] 返回字段结构调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 e945f6f..aeaf1a3 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
@@ -271,6 +271,7 @@
/* 绾㈠寘鐘舵�� 杞崲 */
String stateContent = "";
+ String stateFontColor = "#E5005C";
Integer orderHongBaoState = null;
Integer hongBaoState = order.getHongBaoState();
if (HongBaoV2.STATE_KELINGQU == hongBaoState || HongBaoV2.STATE_BUKELINGQU == hongBaoState) {
@@ -307,9 +308,13 @@
hongbaoInfoFontColor = "#888888";
}
order.setHongBaoState(orderHongBaoState);
- order.setAccountState(stateContent);
order.setHongBaoDate(hongBaoDate);
+ Map<String, String> stateMap = new HashMap<String, String>();
+ stateMap.put("content", stateContent);
+ stateMap.put("fontColor", stateFontColor);
+ order.setAccountState(stateMap);
+
if ("濂栭噾".equals(hongbaoInfo) && hongBaoState_Str.trim().length() > 0) {
hongbaoInfo = hongBaoState_Str + hongbaoInfo;
}
--
Gitblit v1.8.0