From 8a54915d3c39d9d8d7e90c0971d1e19d0eb76622 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 12 六月 2020 14:37:04 +0800
Subject: [PATCH] 券统计

---
 fanli/src/main/java/com/yeshi/fanli/dao/order/OrderMoneyDailyCountDao.java |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/order/OrderMoneyDailyCountDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/order/OrderMoneyDailyCountDao.java
index 9bfbc64..0a089d3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/order/OrderMoneyDailyCountDao.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/order/OrderMoneyDailyCountDao.java
@@ -28,8 +28,7 @@
 import com.mongodb.GroupCommand;
 import com.yeshi.fanli.dao.MongodbBaseDao;
 import com.yeshi.fanli.entity.order.OrderMoneyDailyCount;
-import com.yeshi.fanli.entity.order.OrderMoneyDailyCount.SourceTypeEnum;
-import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.entity.order.SourceTypeEnum;
 import com.yeshi.fanli.vo.order.OrderRankingVO;
 
 @Repository
@@ -81,7 +80,7 @@
 		if (minDay != null)
 			list.add(Criteria.where("countDay").gte(minDay));
 		if (maxDay != null)
-			list.add(Criteria.where("countDay").lte(maxDay));
+			list.add(Criteria.where("countDay").lt(maxDay));
 
 		Query query = new Query();
 		if (list.size() > 0) {
@@ -113,7 +112,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) {
@@ -182,7 +181,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) {
@@ -265,7 +264,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) {
@@ -335,7 +334,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) {
@@ -409,7 +408,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) {
@@ -481,7 +480,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) {
@@ -555,7 +554,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) {
@@ -624,7 +623,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) {
@@ -686,7 +685,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) {

--
Gitblit v1.8.0