Merge remote-tracking branch 'origin/release/3.0' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/common/task/AccountTask.java

src/main/java/com/ai/da/common/task/PaypalTask.java

@@ -23,12 +23,12 @@ public class PaypalTask {
     @Resource
     private PayPalCheckoutService payPalCheckoutService;
 
-//    @Scheduled(cron = "0/30 * * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     public void orderConfirm() throws SerializeException {
 
 //        log.info("PayPal orderConfirm 被执行......");
 
-        List<OrderInfo> orderInfoList = orderInfoService.getNoPayOrderByDuration(5, PayTypeEnum.PAYPAL.getType());
+        List<OrderInfo> orderInfoList = orderInfoService.getNoPayOrderByDuration(30, PayTypeEnum.PAYPAL.getType());
 
         for (OrderInfo orderInfo : orderInfoList) {
             String orderNo = orderInfo.getOrderNo();

src/main/java/com/ai/da/common/task/StripeTask.java

@@ -22,7 +22,7 @@ public class StripeTask {
     @Resource
     private StripeService stripeService;
 
-//    @Scheduled(cron = "0/30 * * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     public void orderConfirm() throws SerializeException {
 
         // 查看超过30分钟以上仍未支付的订单 置为超时订单