From 8f4a68065574a7ef1f9e8b53902d1f081ec69aab Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 三月 2020 10:58:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
index 663d431..cd41e0c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
@@ -1523,7 +1523,11 @@
 		executor.execute(new Runnable() {
 			@Override
 			public void run() {
+				// 鏇存柊淇℃伅
 				updateGoodInfo(list);
+				
+				// 鍒犻櫎宸茶繃鏈�
+				removeOverdue();
 			}
 		});
 
@@ -1670,6 +1674,9 @@
 			@Override
 			public void run() {
 				updateGoodInfo(listOBJ);
+				
+				// 鍒犻櫎宸茶繃鏈�
+				removeOverdue();
 			}
 		});
 
@@ -2330,5 +2337,24 @@
 		}
 	}
 	
-	
+	private void removeOverdue() {
+		List<GoodsEvaluate> list = goodsEvaluateDao.queryOverdue();
+		if (list == null || list.size() == 0) {
+			return;
+		}
+		long nm = 1000 * 60;// 涓�鍒嗛挓鐨勬绉掓暟
+		long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟
+		long nd = 1000 * 24 * 60 * 60;// 涓�澶╃殑姣鏁�
+		
+		long time = java.lang.System.currentTimeMillis();
+		for (GoodsEvaluate goodsEvaluate: list) {
+			long diff = time - goodsEvaluate.getEndTime().getTime();
+			long min = diff % nd % nh / nm; 
+			
+			// 杩囨湡瓒呰繃10鍒嗛挓灏卞垹闄�
+			if (min > 10) {
+				goodsEvaluateDao.remove(goodsEvaluate);
+			}
+		}
+	}
 }

--
Gitblit v1.8.0