From eb58d2d4fcc201dbfb31e96c58e680b7da0a846e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 六月 2020 11:45:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java
index 8f1fb45..eb21b43 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java
@@ -17,6 +17,7 @@
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate.EvaluateEnum;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
@Repository
public class GoodsEvaluateDao {
@@ -400,6 +401,7 @@
list.add(Criteria.where("state").is(1));
list.add(Criteria.where("goods.goodsId").is(goodsId));
list.add(Criteria.where("goods.goodsType").is(goodsType));
+
// 闄愬埗鏃堕棿鍐�
list.add(Criteria.where("startTime").gte(limitTime));
@@ -413,4 +415,31 @@
return mongoTemplate.find(query, GoodsEvaluate.class);
}
+
+
+ public List<GoodsEvaluate> queryValidZeroPoint(int start, int count) {
+ // 浠婃棩22鐐瑰彂鍦� 锛�0鐐逛笅鍗�
+ Date now = new Date();
+ Date startTime = TimeUtil.parseYYYYMMDD_HHMM(TimeUtil.getGernalTime(now) + " 22:00");
+
+ Query query = new Query();
+ List<Criteria> list = new ArrayList<Criteria>();
+
+ list.add(Criteria.where("zeroPoint").is(1));
+ list.add(Criteria.where("dynamicType").is(1));
+ list.add(Criteria.where("state").is(1));
+ list.add(Criteria.where("startTime").is(startTime));
+ list.add(new Criteria().orOperator(Criteria.where("type").is("single"),
+ new Criteria().andOperator(Criteria.where("type").is("activity"))));
+
+ if (list.size() > 0) {
+ Criteria[] cas = new Criteria[list.size()];
+ for (int i = 0; i < list.size(); i++)
+ cas[i] = list.get(i);
+ query.addCriteria(new Criteria().andOperator(cas));
+ }
+ query.skip(start).limit(count);
+ return mongoTemplate.find(query, GoodsEvaluate.class);
+ }
+
}
--
Gitblit v1.8.0