From c6f40776dad4189fb57889ab7fb90a8c0e7b0ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 11 Jul 2024 10:54:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=9C=BA=E5=9C=B0=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E8=A2=AB=E6=8A=A2=E5=8D=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gxwebsoft/shop/controller/OrderController.java   | 2 +-
 src/main/java/com/gxwebsoft/shop/task/OrderTask.java          | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java
index 4f5b264..4092d92 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java
@@ -171,7 +171,7 @@ public class OrderController extends BaseController {
           order.setScene(1234);
         }
       });
-      if(order.getScene().equals(1234)){
+      if(order.getScene() != null && order.getScene().equals(1234)){
         return fail("场地不存在");
       }
     }
diff --git a/src/main/java/com/gxwebsoft/shop/task/OrderTask.java b/src/main/java/com/gxwebsoft/shop/task/OrderTask.java
index 29b758a..ff76757 100644
--- a/src/main/java/com/gxwebsoft/shop/task/OrderTask.java
+++ b/src/main/java/com/gxwebsoft/shop/task/OrderTask.java
@@ -44,9 +44,5 @@ public class OrderTask extends BaseController {
     });
     orderService.updateBatchById(list);
     System.out.println("自动处理过期订单 = " + list.size());
-//    list.forEach(d -> {
-//      System.out.println("任务1：处理未支付订单超时自动关闭 = " + d);
-//      orderMapper.updateExpirationOrder(d.getOrderId());
-//    });
   }
 }