admin
2018-12-25 4cb15e222cd7d099d533ccbeb7f9a8cd99bf180c
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;