From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 cfc5860..7d8ad83 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
@@ -35,6 +35,21 @@
mongoTemplate.save(record);
}
+
+ /**
+ * 鍒犻櫎
+ * @param record
+ */
+ public void remove(GoodsEvaluate record) {
+ if (record == null) {
+ return;
+ }
+ mongoTemplate.remove(record);
+ }
+
+
+
+
/**
* 鏍规嵁id鏌ヨ鏁版嵁
*
@@ -110,7 +125,7 @@
query.addCriteria(Criteria.where("startTime").lte(now));
query.addCriteria(Criteria.where("endTime").gte(now));
query.skip(start).limit(count);
- query.with(new Sort(Sort.Direction.DESC,"weight")).with(new Sort(Sort.Direction.DESC,"createTime"));
+ query.with(new Sort(Sort.Direction.DESC,"weight")).with(new Sort(Sort.Direction.DESC,"startTime"));
return mongoTemplate.find(query, GoodsEvaluate.class);
}
@@ -157,9 +172,24 @@
Query query = new Query();
query.addCriteria(Criteria.where("dynamicType").is(1));
query.addCriteria(Criteria.where("state").is(1));
- query.addCriteria(Criteria.where("goods.goodsId").is(goodsId));
- query.addCriteria(Criteria.where("goods.goodsType").is(goodsType));
+ query.addCriteria(Criteria.where("imgList.goods.goodsId").is(goodsId));
+ query.addCriteria(Criteria.where("imgList.goods.goodsType").is(goodsType));
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();
+ query.addCriteria(Criteria.where("endTime").lte(now));
+ query.with(new Sort(Sort.Direction.ASC,"createTime"));
+ return mongoTemplate.find(query, GoodsEvaluate.class);
+ }
}
--
Gitblit v1.8.0