Merge branch 'master' of http://git.dayaedu.com/yonge/collect_fee

src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -376,7 +376,7 @@ public class YqPayController extends BaseController {
     }
 
 
-    //@Scheduled(cron = "0/5 * * * * ?")
+    @Scheduled(cron = "0/5 * * * * ?")
     //@RequestMapping("/getOrderStatus")
     public void getOrderStatus() throws Exception {
 
@@ -475,13 +475,11 @@ public class YqPayController extends BaseController {
     }
 
     @Transactional
-    @Scheduled(cron = "0 0/5 * * * ?")
+    @Scheduled(cron = "0/5 * * * * ?")
     public void failOrders() throws Exception {
-        logger.info("test\n");
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date now = new Date();
-        long time = 30 * 60 * 1000;
-        Date beforeDate = new Date(now.getTime() - time);
+        Calendar beforeTime = Calendar.getInstance();
+        beforeTime.add(Calendar.MINUTE, -30);// 5分钟之前的时间
+        Date beforeDate = beforeTime.getTime();
         List<Order> payingOrders = orderService.findPayingOrdersOver30(beforeDate);
 
         for (Order order : payingOrders) {