From e009b105f894884b7587f18ef2bef24a7cae7a7a Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Sat, 29 Mar 2025 00:53:37 +0800 Subject: [PATCH] this is 3.24 update --- .../com/cultural/heritage/constant/MqConstant.java | 4 ++-- .../heritage/service/good/impl/GoodServiceImpl.java | 2 ++ src/main/resources/application.yml | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/cultural/heritage/constant/MqConstant.java b/src/main/java/com/cultural/heritage/constant/MqConstant.java index de09c5f..4b4dcee 100644 --- a/src/main/java/com/cultural/heritage/constant/MqConstant.java +++ b/src/main/java/com/cultural/heritage/constant/MqConstant.java @@ -4,9 +4,9 @@ import java.util.List; public interface MqConstant { -// List DELAY_MILLIS = List.of(10000L, 10000L, 10000L, 15000L, 15000L, 30000L, 30000L, 60000L, 60000L, 120000L, 300000L, 600000L, 600000L)); + List DELAY_MILLIS = List.of(10000L, 10000L, 10000L, 15000L, 15000L, 30000L, 30000L, 60000L, 60000L, 120000L, 120000L, 120000L, 300000L); - List DELAY_MILLIS = List.of(10000L, 10000L, 10000L, 15000L, 15000L); +// List DELAY_MILLIS = List.of(10000L, 10000L, 10000L, 15000L, 15000L); String DELAY_EXCHANGE = "delay.topic"; diff --git a/src/main/java/com/cultural/heritage/service/good/impl/GoodServiceImpl.java b/src/main/java/com/cultural/heritage/service/good/impl/GoodServiceImpl.java index a3b47d2..2e84d68 100644 --- a/src/main/java/com/cultural/heritage/service/good/impl/GoodServiceImpl.java +++ b/src/main/java/com/cultural/heritage/service/good/impl/GoodServiceImpl.java @@ -242,6 +242,8 @@ public class GoodServiceImpl extends ServiceImpl implements Go BookingOrderQueryRequest bookingOrderQueryRequest = new BookingOrderQueryRequest(goodId, reservationDate, timeSlot); PendingServiceGood pendingServiceGood = pendingServiceGoodMap.get(bookingOrderQueryRequest.toString()); + if (pendingServiceGood == null) return false; + Integer isAvailable = pendingServiceGood.getIsAvailable(); if (isAvailable == 0) return false; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 83cbd6c..c8a9dd1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -75,12 +75,12 @@ springdoc: server: -# port: 9092 - port: 8888 - ssl: - key-store: classpath:carboner.cn.jks - key-store-password: 6gsn1hke4m4f7 - key-store-type: JKS + port: 9092 +# port: 8888 +# ssl: +# key-store: classpath:carboner.cn.jks +# key-store-password: 6gsn1hke4m4f7 +# key-store-type: JKS servlet: context-path: /api