From 3e4ef41ffacd7f5fda2e81c3810cd11a6375b83c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:32:35 +0800
Subject: [PATCH] 好单库转链支持

---
 fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java
index a20d14b..c3c6e61 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java
@@ -106,7 +106,7 @@
 		if (minDate != null)
 			list.add(Criteria.where("countDay").gte(minDate));
 		if (maxDate != null)
-			list.add(Criteria.where("countDay").lte(maxDate));
+			list.add(Criteria.where("countDay").lt(maxDate));
 		
 		Query query = new Query();
 		if (list.size() > 0) {
@@ -144,7 +144,7 @@
 		if (minDate != null)
 			list.add(Criteria.where("countDay").gte(minDate));
 		if (maxDate != null)
-			list.add(Criteria.where("countDay").lte(maxDate));
+			list.add(Criteria.where("countDay").lt(maxDate));
 
 		Query query = new Query();
 		if (list.size() > 0) {
@@ -209,7 +209,7 @@
 		if (minDate != null)
 			list.add(Criteria.where("countDay").gte(minDate));
 		if (maxDate != null)
-			list.add(Criteria.where("countDay").lte(maxDate));
+			list.add(Criteria.where("countDay").lt(maxDate));
 
 		Query query = new Query();
 		if (list.size() > 0) {
@@ -278,7 +278,7 @@
 		if (minDate != null)
 			list.add(Criteria.where("countDay").gte(minDate));
 		if (maxDate != null)
-			list.add(Criteria.where("countDay").lte(maxDate));
+			list.add(Criteria.where("countDay").lt(maxDate));
 
 		Query query = new Query();
 		if (list.size() > 0) {
@@ -339,7 +339,7 @@
 		if (minDate != null)
 			list.add(Criteria.where("countDay").gte(minDate));
 		if (maxDate != null)
-			list.add(Criteria.where("countDay").lte(maxDate));
+			list.add(Criteria.where("countDay").lt(maxDate));
 
 		Query query = new Query();
 		if (list.size() > 0) {
@@ -404,13 +404,14 @@
 		// 鏌ヨ鏉′欢
 		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("orders.countDay").gt(minDate));
+			list.add(Criteria.where("result.countDay").gt(minDate));
 		}
 		if (maxDate != null) {
 			maxDate = DateUtil.reduceDay(maxDate, 1);
-			list.add(Criteria.where("orders.countDay").lte(maxDate));
+			list.add(Criteria.where("result.countDay").lte(maxDate));
 		}
 		
 		// 杞崲鏁扮粍

--
Gitblit v1.8.0