From afe61a27c4f77db65df66b0ff5dc93cbd3e0014b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 六月 2020 17:49:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 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 4befa67..a09876d 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
@@ -263,6 +263,33 @@
* @param key
* @return
*/
+ public List<GoodsEvaluate> queryExistSingle(int goodsType, String goodsId) {
+ Query query = new Query();
+ List<Criteria> list = new ArrayList<Criteria>();
+ list.add(Criteria.where("dynamicType").is(1));
+ list.add(Criteria.where("state").is(1));
+ list.add(Criteria.where("type").is("single"));
+ list.add(Criteria.where("imgList.goods.goodsId").is(goodsId));
+ list.add(Criteria.where("imgList.goods.goodsType").is(goodsType));
+
+ 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));
+ }
+
+ return mongoTemplate.find(query, GoodsEvaluate.class);
+ }
+
+
+ /**
+ * 鏌ヨ鏈夋晥
+ * @param start
+ * @param count
+ * @param key
+ * @return
+ */
public List<GoodsEvaluate> queryOverdue() {
Date now = new Date();
Query query = new Query();
@@ -303,10 +330,12 @@
*/
public List<GoodsEvaluate> listByStartTime(Date date) {
List<Criteria> list = new ArrayList<Criteria>();
+ list.add(Criteria.where("dynamicType").is(1));
+ list.add(Criteria.where("state").is(1));
list.add(Criteria.where("startTime").gt(new Date()));
list.add(Criteria.where("startTime").lte(date));
list.add(new Criteria().orOperator(Criteria.where("type").is("single"),
- new Criteria().andOperator(Criteria.where("type").is("single"))));
+ new Criteria().andOperator(Criteria.where("type").is("activity"))));
Query query = new Query();
if (list.size() > 0) {
@@ -315,6 +344,8 @@
cas[i] = list.get(i);
query.addCriteria(new Criteria().andOperator(cas));
}
+ query.with(new Sort(Sort.Direction.ASC,"startTime"));
+
return mongoTemplate.find(query, GoodsEvaluate.class);
}
--
Gitblit v1.8.0