Merge remote-tracking branch 'origin/div' into div

admin

2020-05-26 9d6cbe54651bd3951036e611eabd47a713c91a86

 fanli/src/main/java/com/yeshi/fanli/dao/order/OrderMoneyDailyCountDao.java

@@ -424,6 +424,7 @@
      map.put("totalRewardNum", 0);

      map.put("totalSubsidy", 0);

      map.put("totalSubsidyNum", 0);

      map.put("totalNum", 0);

      BasicDBObject initial = new BasicDBObject(map);



      // 进行按天、周、月分组

@@ -455,6 +456,7 @@
               dailyCount.setTeamRewardNum(new BigDecimal(dbObject.get("totalRewardNum").toString()).intValue());

               dailyCount.setTeamSubsidy(new BigDecimal(dbObject.get("totalSubsidy").toString()).intValue());

               dailyCount.setTeamSubsidyNum(new BigDecimal(dbObject.get("totalSubsidyNum").toString()).intValue());

               dailyCount.setTeamDividentsOrderNum(new BigDecimal(dbObject.get("totalNum").toString()).intValue());

               results.add(dailyCount);

            } catch (ParseException e) {

               e.printStackTrace();

@@ -747,6 +749,7 @@
      // 查询条件

      List<Criteria> list = new ArrayList<Criteria>();

      list.add(Criteria.where("bossUid").is(uid));

      list.add(Criteria.where("orders.orderNum").gt(0));

      if (minDate != null) {

         minDate = DateUtil.reduceDay(minDate, 1);

         list.add(Criteria.where("orders.countDay").gt(minDate));