Merge branch 'dev-hongbao'

admin

2019-01-09 baacd1378b33c4a84ee7a4998fb08fd9979ee4e1

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

@@ -105,22 +105,23 @@
            // 统计总数

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

         }

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

         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;

@@ -306,10 +307,13 @@
         JSONObject data = new JSONObject();

         // 分享统计

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

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

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

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