From c3a5e164cbabbfc5f66e1356cb0de657ce3f58b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 三月 2020 13:56:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/dynamic/GoodsEvaluateDao.java |   78 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 74 insertions(+), 4 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 8edaece..d6cfbb6 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
@@ -12,6 +12,8 @@
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Repository;
 
+import com.mongodb.BasicDBObject;
+import com.mongodb.QueryOperators;
 import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
 import com.yeshi.fanli.util.StringUtil;
 
@@ -33,6 +35,21 @@
 		mongoTemplate.save(record);
 	}
 
+	
+	/**
+	 * 鍒犻櫎
+	 * @param record
+	 */
+	public void remove(GoodsEvaluate record) {
+		if (record == null) {
+			return;
+		}
+		mongoTemplate.remove(record);
+	}
+	
+	
+	
+	
 	/**
 	 * 鏍规嵁id鏌ヨ鏁版嵁
 	 * 
@@ -65,8 +82,9 @@
 	 * 
 	 * @return
 	 */
-	public List<GoodsEvaluate> query(int start, int count, String key, Integer state) {
+	public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType) {
 		Query query = new Query();
+		query.addCriteria(Criteria.where("dynamicType").is(dynamicType));
 		if (state != null) {
 			query.addCriteria(Criteria.where("state").is(state));
 		}
@@ -79,8 +97,10 @@
 		return mongoTemplate.find(query, GoodsEvaluate.class);
 	}
 
-	public long count(String key, Integer state) {
+	public long count(String key, Integer state, int dynamicType) {
 		Query query = new Query();
+		query.addCriteria(Criteria.where("dynamicType").is(dynamicType));
+
 		if (state != null) {
 			query.addCriteria(Criteria.where("state").is(state));
 		}
@@ -97,9 +117,10 @@
 	 * @param key
 	 * @return
 	 */
-	public List<GoodsEvaluate> queryValid(int start, int count) {
+	public List<GoodsEvaluate> queryValid(int start, int count, int dynamicType) {
 		Date now = new Date();
 		Query query = new Query();
+		query.addCriteria(Criteria.where("dynamicType").is(dynamicType));
 		query.addCriteria(Criteria.where("state").is(1));
 		query.addCriteria(Criteria.where("startTime").lte(now));
 		query.addCriteria(Criteria.where("endTime").gte(now));
@@ -113,13 +134,62 @@
 	 * @param key
 	 * @return
 	 */
-	public long countValid() {
+	public long countValid(int dynamicType) {
 		Date now = new Date();
 		Query query = new Query();
+		query.addCriteria(Criteria.where("dynamicType").is(dynamicType));
 		query.addCriteria(Criteria.where("state").is(1));
 		query.addCriteria(Criteria.where("startTime").lte(now));
 		query.addCriteria(Criteria.where("endTime").gte(now));
 		return mongoTemplate.count(query, GoodsEvaluate.class);
 	}
+	
+	
+	/**
+	 * 鏌ヨ鏈夋晥
+	 * @param start
+	 * @param count
+	 * @param key
+	 * @return
+	 */
+	public List<GoodsEvaluate> querySingleExist() {
+		Query query = new Query();
+		query.addCriteria(Criteria.where("dynamicType").is(1));
+		query.addCriteria(Criteria.where("state").is(1));
+		query.addCriteria(Criteria.where("goods.goodsType").is(1));
+		return mongoTemplate.find(query, GoodsEvaluate.class);
+	}
+	
+	
+	/**
+	 * 鏌ヨ鏈夋晥
+	 * @param start
+	 * @param count
+	 * @param key
+	 * @return
+	 */
+	public List<GoodsEvaluate> queryExist(int goodsType, Long goodsId) {
+		Query query = new Query();
+		query.addCriteria(Criteria.where("dynamicType").is(1));
+		query.addCriteria(Criteria.where("state").is(1));
+		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