资金统计修改

admin

2019-01-11 13ec337a0d24485d9f006cfd44ea5d69c00540f3

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

@@ -94,21 +94,30 @@
      

      try {

         long count = 0;

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

         }

			
         int totalValid = 0;

         int totalProces = 0;

         int totalInvite = 0;

         long todayTotal = 0;

         BigDecimal todayMoney = null;

         // 需要统计信息

			
         // 查询列表

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

				
            todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);

				
            todayTotal =  commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime);

				
            // 统计有效的订单数量 、 失效订单数量 、维权订单数量

            Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type, 

                  startTime, endTime, dateType);

            

@@ -123,14 +132,12 @@
            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);

            todayMoney = new BigDecimal(0.00);

         }

			
         

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

         

@@ -142,9 +149,12 @@
         

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

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

         } else {

         } 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); // 维权数量

@@ -188,7 +198,7 @@
         data.put("userInfo", userInfo);

         

         /* 总订单统计   */

         Map<String, BigDecimal> countOrder= commonOrderService.countOrderByHongBaoType(uid, null);

         Map<String, BigDecimal> countOrder= commonOrderService.countHistoryOrder(uid, null);

         int self = 0;

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

            self = countOrder.get("totalSelf").intValue();

@@ -212,7 +222,7 @@
         data.put("invite", invite);

         

         /*  今日订单统计  */

         Map<String, BigDecimal> countToday= commonOrderService.countOrderByHongBaoType(uid, 1);

         Map<String, BigDecimal> countToday= commonOrderService.countHistoryOrder(uid, 1);

         

         int todaySelf = 0;

         if (countToday.get("totalSelf") != null) {

@@ -240,7 +250,7 @@
         data.put("today", todaydata);

         

         /*  昨日订单统计   */

         Map<String, BigDecimal> countYesterday= commonOrderService.countOrderByHongBaoType(uid, 2);

         Map<String, BigDecimal> countYesterday= commonOrderService.countHistoryOrder(uid, 2);

         int yesterdaySelf = 0;

         if (countYesterday.get("totalSelf") != null) {

            yesterdaySelf = countYesterday.get("totalSelf").intValue();

@@ -290,12 +300,15 @@
         

         JSONObject data = new JSONObject();

         // 分享统计

         BigDecimal sharemoney = commonOrderService.countOrderMoney(uid,2, dateType);

         data.put("shareCount", commonOrderService.countOrder(uid, 2, dateType));

         BigDecimal sharemoney = commonOrderService.countBonusOrderMoney(uid,2, dateType, null, null);

			
         data.put("shareCount", commonOrderService.countBonusOrderNumber(uid, 2, dateType, null, null));

         data.put("sharemoney", sharemoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

			
         // 邀请统计

         BigDecimal inviteMoney = commonOrderService.countOrderMoney(uid,3, dateType);

         data.put("inviteCount", commonOrderService.countOrder(uid, 3, dateType));

         BigDecimal inviteMoney = commonOrderService.countBonusOrderMoney(uid,3, dateType, null, null);

			
         data.put("inviteCount", commonOrderService.countBonusOrderNumber(uid, 3, dateType, null, null));

         data.put("inviteMoney", inviteMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

         

         data.put("showTiCheng", hongBaoService.getTotalTiChengCount(uid) > 0);