Merge branch 'div1'

yujian

2019-01-08 a79be5c75d4409bd14a36b648c1a398b409cad65

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

@@ -73,41 +73,64 @@
         page = 1;

      }

      

      if (state !=null && state == 0) {

         state = null;

      if (state != null && state == 0) {

         state = null;// 所有状态

      }

      

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

         type = null; // 查询所有类型订单

         type = null; // 所有类型订单

      }

      

      try {

         if (slotTime != null) {

            SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");

            startTime = sd.format(new Date());

            endTime = convertDate(slotTime, startTime);

             endTime= sd.format(new Date());

             startTime = convertDate(slotTime, endTime);

         }

      } catch (Exception e) {

         e.printStackTrace();

      }

      

		
      try {

         long count = 0;

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

               startTime, endTime, dateType);

         long todayTotal = 0;

         BigDecimal todayMoney = new BigDecimal(0.00);

			
         // 查询列表

         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);

         }

			
         // 需要统计筛选信息 ：未失效的总金额 以及订单

         if (needCount && page == 1) {

            Map<String, Object> countMap = commonOrderService.countMoneyGroupOrderNoByUid(uid, type,

                  orderNo, startTime, endTime, dateType);

            if (countMap != null) {

               BigDecimal totalMoney = (BigDecimal) countMap.get("totalMoney");

               if (totalMoney != null) {

                  todayMoney = totalMoney;// 当前查询所有订单已到账总金额

               }

					
               //当前查询所有已到账订单数量

               todayTotal  = (long) countMap.get("totalRow");

            }

         }

			
         

         int totalValid = 0;

         int totalProces = 0;

         int totalInvite = 0;

         long todayTotal = 0;

         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();

@@ -120,15 +143,8 @@
            if (countOrder.get("totalInvite") != null) {

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

            }   

				
            todayTotal = commonOrderService.countOrder(uid, type, 1);

            todayMoney = commonOrderService.countOrderMoney(uid, type , 1); 
         }

      

         if (todayMoney == null) {

            todayMoney = new BigDecimal(0);

         }

			
         String helpUrl = configService.get("order_list_help");

         

         JSONObject data = new JSONObject();

@@ -137,8 +153,15 @@
         

         data.put("helpUrl", helpUrl);

         

         data.put("todayTotal", todayTotal);

         data.put("todayMoney", todayMoney);

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

            data.put("todayMoney", "预估返利总额 ¥" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

         } else if (type != null &&(type == 2 || type == 3)) {

            data.put("todayMoney", "预估奖金总额 ¥" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

         } else {

            data.put("todayMoney", "预估总额 ¥" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

         }

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

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

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

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

@@ -309,32 +332,32 @@
    * @return

    * @throws Exception

    */

   public String convertDate (Integer slotTime, String startTime) throws Exception {

      String endTime = null;

   public String convertDate (Integer slotTime, String endTime) throws Exception {

      String startTime = null;

      

      switch (slotTime) {

         case 1: // 最近三天

            endTime = DateUtil.plusDay(3, startTime);

            startTime = DateUtil.reduceDay(3, endTime);

            break;

         case 2: // 最近七天

            endTime = DateUtil.plusDay(7, startTime);

            startTime = DateUtil.reduceDay(7, endTime);

            break;

         case 3: // 最近15天 （半月）

            endTime = DateUtil.plusDay(15, startTime);

            startTime = DateUtil.reduceDay(15, endTime);

            break;

         case 4: // 最近三十天 （本月）

            endTime = DateUtil.plusDay(30, startTime);

            startTime = DateUtil.reduceDay(30, endTime);

            break;

         case 5: // 最近九十天（近三月）

            endTime = DateUtil.plusDay(3*30, startTime);

            startTime = DateUtil.reduceDay(3*30, endTime);

            break;

         case 6: // 最近一百八十天（近半年）

            endTime = DateUtil.plusDay(6*30, startTime);

            startTime = DateUtil.reduceDay(6*30, endTime);

            break;

         default:

            break;

      }

      

      return endTime;

      return startTime;

   }

}