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

admin

2020-05-26 9d6cbe54651bd3951036e611eabd47a713c91a86

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

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

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


 fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java

@@ -404,6 +404,7 @@
        // 查询条件

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

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

        list.add(Criteria.where("result.firstNum").gt(0));

        if (minDate != null) {

            minDate = DateUtil.reduceDay(minDate, 1);

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