yujian
2018-12-27 dd865e62a9e687aeb2436a59a76bbe461bd83eaf
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -126,8 +126,9 @@
   }
   
   @Override
   public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime,String endTime) {
      return commonOrderMapper.countByUidAndOrderState(uid, type,  startTime, endTime);
   public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime,
         String endTime, Integer day) {
      return commonOrderMapper.countByUidAndOrderState(uid, type,  startTime, endTime, day);
   }
   
   public void listDataFactory (List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods ) {
@@ -163,6 +164,16 @@
               commonGoodsVO.setActualPay(commonOrder.getTotalSettlement());
               
               listOrderGoods.add(commonGoodsVO);
               Integer orderType = commonOrder.getOrderType();
               if (orderType == null) {
                  String shopType = commonGoodsVO.getShopType();
                  if (CommonOrderGoodsVO.TYPE_TAOBAO.equalsIgnoreCase(shopType)) {
                     commonOrder.setOrderType(1);
                  } else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
                     commonOrder.setOrderType(2);
                  }
               }
               
               break;
            }
@@ -258,16 +269,15 @@
         String hongBaoState_Str = "";
         String hongbaoInfoFontColor = "#E5005C";
         
         /* 红包状态 转换 */
         String stateContent = "";
         String stateFontColor = "#E5005C";
         Integer orderHongBaoState = null;
         Integer hongBaoState = order.getHongBaoState();
         if (HongBaoV2.STATE_KELINGQU == hongBaoState || HongBaoV2.STATE_BUKELINGQU == hongBaoState) {
            orderHongBaoState = 1;
            stateContent = "未到账";
            hongBaoState_Str = "预估";
            hongbaoInfoFontColor = "#888888";
            
            Date preAccountTime = order.getPreAccountTime();
            if (preAccountTime != null) {
@@ -295,11 +305,16 @@
            orderHongBaoState = 4;
            stateContent = "已失效";   
            hongBaoDate = "  ";
            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;
         }