yujian
2019-01-12 42b206d89cf0a6f4c2bb2567d867d7c479d6edf1
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();
@@ -116,6 +116,7 @@
            todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);
            
            todayTotal =  commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime);
            
            // 统计有效的订单数量 、 失效订单数量 、维权订单数量
            Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type, 
@@ -313,7 +314,6 @@
            Object totalmoney = shareMap.get("totalmoney");
            if (totalmoney != null) {
               sharemoney = (BigDecimal) totalmoney;
               sharemoney = sharemoney.setScale(2, BigDecimal.ROUND_DOWN);
            }
         }
         
@@ -327,17 +327,16 @@
            
            Object totalmoney = inviteMap.get("totalmoney");
            if (totalmoney != null) {
               sharemoney = (BigDecimal) totalmoney;
               inviteMoney = sharemoney.setScale(2, BigDecimal.ROUND_DOWN);
               inviteMoney = (BigDecimal) totalmoney;
            }
         }
         
         
         JSONObject data = new JSONObject();
         data.put("shareCount", shareCount);
         data.put("sharemoney", sharemoney);
         data.put("sharemoney",  sharemoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
         data.put("inviteCount", inviteCount);
         data.put("inviteMoney", inviteMoney);
         data.put("inviteMoney", inviteMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
         
         data.put("showTiCheng", hongBaoV2CountService.getTotalTiChengCount(uid) > 0);
         out.print(JsonUtil.loadTrueResult(data));