Merge branch 'div1'

yujian

2019-01-08 a79be5c75d4409bd14a36b648c1a398b409cad65

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

@@ -94,19 +94,39 @@
      

      try {

         long count = 0;

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

         }

         

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

         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, 

@@ -123,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();

@@ -141,10 +154,13 @@
         data.put("helpUrl", helpUrl);

         

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

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

            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("todayMoney", "预估总额 ¥" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

         }

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

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

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