From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级

---
 fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamDailyRecordDao.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 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..eabf62c 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
@@ -25,7 +25,7 @@
 import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 import com.mongodb.GroupCommand;
-import com.yeshi.fanli.dao.MongodbBaseDao;
+import com.yeshi.common.MongodbBaseDao;
 import com.yeshi.fanli.entity.bus.user.invite.TeamDailyRecord;
 import com.yeshi.fanli.vo.order.OrderRankingVO;
 
@@ -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