yujian
2018-12-27 dd865e62a9e687aeb2436a59a76bbe461bd83eaf
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;
         }