新版订单统计，返利，到账修改

admin

2019-01-05 374fa38b5e4c17c079e027e9987e966f30a5cd36

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java

@@ -93,11 +93,12 @@
      

      try {

         long count = 0;

         List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState, orderNo,

               startTime, endTime, dateType);

         List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState,

               orderNo, startTime, endTime, dateType);

         

         if (list != null && list.size() > 0) {

            count = commonOrderService.countGroupOrderNoByUid(uid,  state, type, orderState, orderNo, startTime, endTime, dateType);

            count = commonOrderService.countGroupOrderNoByUid(uid,  state, type, orderState, orderNo, 
                  startTime, endTime, dateType);

         }

         

         int totalValid = 0;

@@ -107,7 +108,8 @@
         BigDecimal todayMoney = null;

         // 需要统计信息

         if (needCount && page == 1) {

            Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type, startTime, endTime);

            Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type, 
                  startTime, endTime, dateType);

            

            if (countOrder.get("totalValid") != null) {

               totalValid = countOrder.get("totalValid").intValue();

@@ -137,8 +139,12 @@
         

         data.put("helpUrl", helpUrl);

         

         data.put("todayTotal", todayTotal);

         data.put("todayMoney", todayMoney);

         if (type != null && type == 1) {

            data.put("todayMoney", "今日预估返利总额 ¥" + todayMoney);

         } else {

            data.put("todayMoney", "预估奖金总额 ¥" + todayMoney);

         }

         data.put("todayTotal", "共"+ todayTotal+ "笔");

         data.put("totalValid", totalValid); // 有效数量

         data.put("totalProces", totalProces); // 维权数量

         data.put("totalInvite", totalInvite); // 失效数量