From eda623f37c3260f4b4657e34a8a39798c72432b1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 28 六月 2020 15:49:14 +0800
Subject: [PATCH] 搜索接口增加小黄条返回

---
 fanli/src/main/java/com/yeshi/fanli/job/UserCloudJob.java |   41 +++++++++++++++++++++++++++++------------
 1 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UserCloudJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UserCloudJob.java
index 5f14f99..428dee7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UserCloudJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UserCloudJob.java
@@ -11,6 +11,8 @@
 
 import com.yeshi.fanli.entity.bus.user.cloud.UserCloudOrder;
 import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
+import com.yeshi.fanli.entity.dynamic.GoodsEvaluate.EvaluateEnum;
+import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
 import com.yeshi.fanli.service.inter.user.cloud.UserCloudOrderService;
 import com.yeshi.fanli.service.inter.user.cloud.UserCloudService;
@@ -48,6 +50,7 @@
 			try {
 				userCloudAlipayManager.tradeQueryByOrderId(cloudOrder.getId());
 			} catch (Exception e) {
+				LogHelper.errorDetailInfo(e);
 				e.printStackTrace();
 			}
 		}
@@ -57,7 +60,7 @@
 	 * 瀹氭椂妫�娴嬫槸鍚﹀瓨鍦ㄦ柊鐨勫彂鍦�
 	 */
 	@Scheduled(cron = "0 0/20 * * * ? ")
-	public void dailyCount() {
+	public void fixedTimeSend() {
 		if (!Constant.IS_TASK) {
 			return;
 		}
@@ -66,19 +69,33 @@
 		Calendar nowCalendar = Calendar.getInstance();
 		nowCalendar.setTimeInMillis(java.lang.System.currentTimeMillis());
 		int hour = nowCalendar.get(Calendar.HOUR_OF_DAY);
-		if (hour < 9 && hour > 21)
+		if (hour < 9 || hour > 21)
 			return;
 
-		// 涓�涓皬鏃朵箣鍐呮渶鏂板彂鍦�
-		long rand = 1000 * 60 * 60;
-		long time = java.lang.System.currentTimeMillis() - rand;
-		Date lastTime = new Date(time);
-
-		List<GoodsEvaluate> list = goodsEvaluateService.listByStartTime(lastTime);
-		if (list == null || list.size() == 0)
-			return;
-
-		userCloudService.fixedTimeSend(list.get(0).getId());
+		// 娲诲姩鍒楄〃
+		List<GoodsEvaluate> listActivity = goodsEvaluateService.queryValidSortASC(1, 100, EvaluateEnum.activity, false);
+		// 鍗曞搧鍟嗗搧
+		List<GoodsEvaluate> listGoods = goodsEvaluateService.queryValidSortASC(1, 5, EvaluateEnum.single, true);
+		// 鎵ц鍙戝崟
+		userCloudService.fixedTimeSend(listActivity, listGoods, true);
 	}
 
+	 
+	/**
+	 * 姣忔棩22鐐硅繘琛屾繁澶滃彂鍦�
+	 */
+	@Scheduled(cron = "0 0 22 * * ? ")
+	public void zeroPoint() {
+		if (!Constant.IS_TASK) {
+			return;
+		}
+		
+		List<GoodsEvaluate> list = goodsEvaluateService.queryValidZeroPoint(1, 50);
+		if (list == null || list.size() == 0) {
+			return;
+		}
+		// 鎵ц鍙戝崟
+		userCloudService.fixedTimeSend(null, list, false);
+	}
+	
 }

--
Gitblit v1.8.0