From 770ede03b2e532ff3729a8f447bdb4351637ca63 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 02 六月 2020 12:02:58 +0800
Subject: [PATCH] 云发单兼容动态+商品详情

---
 fanli/src/main/java/com/yeshi/fanli/job/UserCloudJob.java |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 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 ebfdcba..5f14f99 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UserCloudJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UserCloudJob.java
@@ -1,5 +1,7 @@
 package com.yeshi.fanli.job;
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -8,38 +10,41 @@
 import org.springframework.stereotype.Component;
 
 import com.yeshi.fanli.entity.bus.user.cloud.UserCloudOrder;
+import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
 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;
 import com.yeshi.fanli.service.manger.alipay.UserCloudAlipayManager;
 import com.yeshi.fanli.util.Constant;
 
 @Component
 public class UserCloudJob {
+	@Resource
+	private UserCloudService userCloudService;
 
 	@Resource
 	private UserCloudOrderService userCloudOrderService;
-	
+
 	@Resource
 	private UserCloudAlipayManager userCloudAlipayManager;
-	
+
 	@Resource
 	private GoodsEvaluateService goodsEvaluateService;
 
-	
 	/**
 	 * 姣忓崄鍒嗛挓妫�娴嬫槸鍚︿粯娆�
 	 */
 	@Scheduled(cron = "0 0/10 * * * ? ")
-	public  void tradeQuery() {
+	public void tradeQuery() {
 		if (!Constant.IS_TASK) {
 			return;
 		}
-	 
+
 		List<UserCloudOrder> list = userCloudOrderService.getLasthourByUnpaid();
 		if (list == null || list.size() == 0)
 			return;
-		
-		for (UserCloudOrder cloudOrder: list) {
+
+		for (UserCloudOrder cloudOrder : list) {
 			try {
 				userCloudAlipayManager.tradeQueryByOrderId(cloudOrder.getId());
 			} catch (Exception e) {
@@ -48,30 +53,32 @@
 		}
 	}
 
-	
 	/**
 	 * 瀹氭椂妫�娴嬫槸鍚﹀瓨鍦ㄦ柊鐨勫彂鍦�
 	 */
 	@Scheduled(cron = "0 0/20 * * * ? ")
-	public  void dailyCount() {
+	public void dailyCount() {
 		if (!Constant.IS_TASK) {
 			return;
 		}
-	 
-		goodsEvaluateService.getById(id)
-		
-		List<UserCloudOrder> list = userCloudOrderService.getLasthourByUnpaid();
+
+		// 9-21 鎵ц浜戝彂鍗�
+		Calendar nowCalendar = Calendar.getInstance();
+		nowCalendar.setTimeInMillis(java.lang.System.currentTimeMillis());
+		int hour = nowCalendar.get(Calendar.HOUR_OF_DAY);
+		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;
-		
-		for (UserCloudOrder cloudOrder: list) {
-			try {
-				userCloudAlipayManager.tradeQueryByOrderId(cloudOrder.getId());
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
+
+		userCloudService.fixedTimeSend(list.get(0).getId());
 	}
-	
 
 }

--
Gitblit v1.8.0