From 80cc00e2ecdcae4ebbef2d365355d29c2bdd4744 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 8 May 2025 17:28:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=A2=84=E5=AE=9A=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9C=A8=E6=97=B6=E9=97=B4=E6=AE=B5=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/order/HardOrderServiceImpl.java       | 18 +++++++++++++++++-
 .../controller/pay/ThirdPayApiController.java  |  3 ---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
index 4220954ac..973da493c 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
@@ -73,6 +73,7 @@ import org.springframework.validation.annotation.Validated;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -268,9 +269,12 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         // 查询用户
         UserInfo userDetail = userService.getInnerByUserId(dto.getUserId()).getData();
         if (ObjectUtil.isEmpty(userDetail)) throw new RuntimeException("用户不存在不存在");
+        // 如果是预约判断是否在预约时间段内
+        boolean inReserveTime = isInReserveTime(dto.getApptId());
+        if (!inReserveTime) throw new RuntimeException("不在预约时间段内");
         // 判断是否有重复的预约订单
         Long reserveCount = isHaveCanteenReserve(dto.getUserId());
-        if (reserveCount > 100) throw new RuntimeException("您有" + reserveCount + "笔未核销的预约订单，请先核销");
+        if (reserveCount > 3) throw new RuntimeException("您有" + reserveCount + "笔未核销的预约订单，请先核销");
         // 钱包
         WalletManageEntity wallet = remoteWalletService.getWallet(dto.getUserId(), dto.getWalletType()).getData();
         if (ObjectUtil.isEmpty(wallet)) throw new RuntimeException("用户钱包不存在");
@@ -814,6 +818,18 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         );
     }
 
+    // 是否在预约时间段内
+    private boolean isInReserveTime(Long apptId) {
+        if (ObjectUtil.isEmpty(apptId)) return true;
+        HardApptEntity apptDetail = hardApptService.getById(apptId);
+        if (ObjectUtil.isEmpty(apptDetail)) {
+            throw new RuntimeException("请先配置预约时间段");
+        }
+        LocalTime startTime = apptDetail.getStartTime();
+        LocalTime endTime = apptDetail.getEndTime();
+        return LocalTime.now().isAfter(startTime) && LocalTime.now().isBefore(endTime);
+    }
+
     /* ************************************* end 支付相关 end ************************************* */
 
     private HardOrderServiceImpl getSelf() {
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/pay/ThirdPayApiController.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/pay/ThirdPayApiController.java
index 88baed081..761a9af82 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/pay/ThirdPayApiController.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/pay/ThirdPayApiController.java
@@ -1,11 +1,8 @@
 package com.bsd.pjcloud.thirdparty.controller.pay;
 
 
-import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.security.annotation.Inner;
-import com.bsd.pjcloud.thirdparty.dto.pay.PayGetWalletInfoDto;
 import com.bsd.pjcloud.thirdparty.service.ThirdPayApiService;
-import com.bsd.pjcloud.thirdparty.service.ThirdPayLogService;
 import com.bsd.pjcloud.thirdparty.vo.pay.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;