From 15defa991fcd30b9fa60bab17d2230b5929bf2a2 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 14 九月 2026 17:20:20 +0800
Subject: [PATCH] update
---
backend/src/main/java/com/tourguide/modules/user/service/GuideReceivingService.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/backend/src/main/java/com/tourguide/modules/user/service/GuideReceivingService.java b/backend/src/main/java/com/tourguide/modules/user/service/GuideReceivingService.java
index 88d9c7d..26a5c23 100644
--- a/backend/src/main/java/com/tourguide/modules/user/service/GuideReceivingService.java
+++ b/backend/src/main/java/com/tourguide/modules/user/service/GuideReceivingService.java
@@ -96,7 +96,8 @@
item.getDurationMinutes(), item.getMinParticipants(), item.getMaxParticipants(),
item.getOriginalPrice(), item.getDiscountPrice()))
.collect(Collectors.toList());
- rows.add(new GuideReceivingOptionResponse.ScenicOption(scenic.getId(), scenic.getScenicName(), points, services));
+ rows.add(new GuideReceivingOptionResponse.ScenicOption(scenic.getId(), scenic.getScenicName(),
+ positive(scenic.getFirstOrderLeadMinutes(), 15), points, services));
}
return new GuideReceivingOptionResponse(premiumEnabled, value(settings.getPreciseDispatchOrderCount()),
settings.getPreciseDispatchRating(), rows);
@@ -137,8 +138,8 @@
if (session == null) {
return null;
}
- if ("IN_SERVICE".equals(session.getStatus())) {
- return hasActiveServiceOrder(session) ? session : null;
+ if (hasActiveServiceOrder(session)) {
+ return session;
}
GuideRealtimeStatus realtimeStatus = realtimeStatusMapper.selectById(guideId);
@@ -292,4 +293,8 @@
}
private long value(Integer number) { return number == null ? 0L : number.longValue(); }
+
+ private int positive(Integer number, int fallback) {
+ return number == null || number < 1 ? fallback : number;
+ }
}
--
Gitblit v1.7.1