From 3cffc27064edbb419a7eabad3a98c10a4060a0b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 26 Jun 2024 16:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AC=A1=E5=8D=A1=E9=80=82=E7=94=A8=E4=BA=BA?=
 =?UTF-8?q?=E7=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bl/order/service/impl/UserPackageOrderServiceImpl.java     | 2 +-
 .../resources/mapper/bl/massage/MassagePackageDetailDao.xml    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java
index e6190ba..575f54e 100644
--- a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java
+++ b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java
@@ -359,7 +359,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
     /**
      * 每5分钟自动扫描未支付订单，进行取消，释放代金券
      */
-//    @Scheduled(cron = "0 0/5 * * * ?")
+    @Scheduled(cron = "0 0/5 * * * ?")
     public void autoCancelOrders() {
         String value1 = commonInfoService.findOne(388).getValue();
         List<UserPackageOrder> ordersList = baseMapper.selectOrdersStatusByTime(value1);
diff --git a/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml b/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml
index e0de789..3fe76fd 100644
--- a/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml
+++ b/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml
@@ -18,7 +18,8 @@
             b.duration,
             b.status,
             b.classify_id as type,
-            b.jianjie
+            b.jianjie,
+            b.apply_people
         from bl_massage_package_detail a inner join massage_type b on a.massage_type_id = b.massage_type_id
         where a.main_id = #{params.mainId}
         <if test="params.status!=null and params.status!=0">