From 2b0d0fd1398e2afa96d8ddf919d8b814c9cb92e4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 16 六月 2020 16:54:15 +0800
Subject: [PATCH] 好单库商品+云发单规则调整

---
 fanli/src/main/java/com/yeshi/fanli/job/UserCloudJob.java |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 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 cb1eaf4..9544892 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,7 @@
 
 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;
@@ -68,19 +69,15 @@
 		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);
 	}
 
 }

--
Gitblit v1.8.0