yujian
2019-01-11 4e7bcd65a96e0c00ff228677649986b682fee0d3
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
@@ -83,9 +83,9 @@
      
      try {
         if (slotTime != null) {
            SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
             endTime= sd.format(new Date());
             startTime = convertDate(slotTime, endTime);
            SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
            endTime= sd.format(new Date());
            startTime = convertDate(slotTime, endTime);
         }
      } catch (Exception e) {
         e.printStackTrace();
@@ -113,9 +113,21 @@
         // 需要统计筛选信息 :未失效的总金额 以及订单
         if (needCount && page == 1) {
            
            todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);
            Map<String, Object> shareMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, type,
                  dateType, startTime, endTime);
            
            todayTotal =  commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime);
            if (shareMap != null) {
               Object totalNum = shareMap.get("totalNum");
               if (totalNum != null) {
                  todayTotal = (long) totalNum;
               }
               Object totalmoney = shareMap.get("totalmoney");
               if (totalmoney != null) {
                  todayMoney = (BigDecimal) totalmoney;
               }
            }
            
            // 统计有效的订单数量 、 失效订单数量 、维权订单数量
            Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type, 
@@ -327,8 +339,8 @@
            
            Object totalmoney = inviteMap.get("totalmoney");
            if (totalmoney != null) {
               sharemoney = (BigDecimal) totalmoney;
               inviteMoney = sharemoney.setScale(2, BigDecimal.ROUND_DOWN);
               inviteMoney = (BigDecimal) totalmoney;
               inviteMoney = inviteMoney.setScale(2, BigDecimal.ROUND_DOWN);
            }
         }