From 4f6f15b818704079ff2e4e4719b798f48d68a335 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 11 九月 2026 13:52:19 +0800
Subject: [PATCH] update
---
backend/src/main/java/com/tourguide/modules/user/service/GuideReceivingService.java | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 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 3b34657..868c3dc 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
@@ -89,7 +89,8 @@
new LambdaQueryWrapper<ScenicPricing>().eq(ScenicPricing::getScenicSpotId, scenic.getId())
.orderByAsc(ScenicPricing::getId)).stream()
.map(item -> new GuideReceivingOptionResponse.ServiceOption(item.getId(), item.getServiceType(),
- item.getDurationMinutes(), item.getMinParticipants(), item.getMaxParticipants()))
+ item.getDurationMinutes(), item.getMinParticipants(), item.getMaxParticipants(),
+ item.getOriginalPrice(), item.getDiscountPrice()))
.collect(Collectors.toList());
rows.add(new GuideReceivingOptionResponse.ScenicOption(scenic.getId(), scenic.getScenicName(), points, services));
}
@@ -125,10 +126,24 @@
public GuideReceivingSession current(Long guideId) {
guideUserService.findEnabledById(guideId);
- return sessionMapper.selectOne(new LambdaQueryWrapper<GuideReceivingSession>()
+ GuideReceivingSession session = sessionMapper.selectOne(new LambdaQueryWrapper<GuideReceivingSession>()
.eq(GuideReceivingSession::getGuideId, guideId)
.in(GuideReceivingSession::getStatus, "RECEIVING", "ASSIGNED", "IN_SERVICE")
.orderByDesc(GuideReceivingSession::getId).last("LIMIT 1"));
+ if (session == null) {
+ return null;
+ }
+ if ("IN_SERVICE".equals(session.getStatus())) {
+ return hasActiveServiceOrder(session) ? session : null;
+ }
+
+ GuideRealtimeStatus realtimeStatus = realtimeStatusMapper.selectById(guideId);
+ if (realtimeStatus == null
+ || !Integer.valueOf(1).equals(realtimeStatus.getOnlineStatus())
+ || !Integer.valueOf(1).equals(realtimeStatus.getAvailableStatus())) {
+ return null;
+ }
+ return session;
}
@Transactional
@@ -136,7 +151,9 @@
guideUserService.findEnabledById(guideId);
stopActiveSessions(guideId);
realtimeStatusMapper.update(null, new LambdaUpdateWrapper<GuideRealtimeStatus>()
- .eq(GuideRealtimeStatus::getGuideId, guideId).set(GuideRealtimeStatus::getAvailableStatus, 0));
+ .eq(GuideRealtimeStatus::getGuideId, guideId)
+ .set(GuideRealtimeStatus::getOnlineStatus, 0)
+ .set(GuideRealtimeStatus::getAvailableStatus, 0));
}
@Transactional
@@ -201,7 +218,10 @@
.eq(ScenicPricing::getScenicSpotId, scenicId)).stream()
.map(ScenicPricing::getServiceType).collect(Collectors.toSet());
for (String type : serviceTypes) {
- if (!type.startsWith(mode + "_") || !configured.contains(type)) {
+ boolean modeMatches = "ALL".equals(mode)
+ ? (type.startsWith("GROUP_") || type.startsWith("PRIVATE_"))
+ : type.startsWith(mode + "_");
+ if (!modeMatches || !configured.contains(type)) {
throw new BusinessException(400, "service type does not match receiving mode or scenic configuration");
}
if (type.endsWith("_PREMIUM") && !premiumEnabled(guide, platformSettingsService.getSettings())) {
@@ -211,8 +231,15 @@
}
private boolean premiumEnabled(GuideUser guide, PlatformSettingsResponse settings) {
- if (guide.getAutoDisableWhitelisted() != null && guide.getAutoDisableWhitelisted() == 1) {
+ if (guide == null) {
+ return false;
+ }
+ if (Integer.valueOf(1).equals(guide.getPremiumEnabled())
+ || Integer.valueOf(1).equals(guide.getAutoDisableWhitelisted())) {
return true;
+ }
+ if (settings == null) {
+ return false;
}
long orderCount = guide.getAcceptedOrderCount() == null ? 0 : guide.getAcceptedOrderCount();
BigDecimal rating = guide.getRating() == null ? BigDecimal.ZERO : guide.getRating();
@@ -225,6 +252,29 @@
.eq(GuideReceivingSession::getGuideId, guideId)
.in(GuideReceivingSession::getStatus, "RECEIVING", "ASSIGNED")
.set(GuideReceivingSession::getStatus, "STOPPED"));
+
+ // 订单取消后可能遗留 IN_SERVICE 会话；无未完成订单时才安全关闭。
+ long activeOrderCount = orderMapper.selectCount(new LambdaQueryWrapper<TourOrder>()
+ .eq(TourOrder::getGuideId, guideId)
+ .in(TourOrder::getStatus,
+ OrderStatus.PENDING_ACCEPT.getCode(),
+ OrderStatus.PENDING_MEETING.getCode(),
+ OrderStatus.IN_SERVICE.getCode()));
+ if (activeOrderCount == 0) {
+ sessionMapper.update(null, new LambdaUpdateWrapper<GuideReceivingSession>()
+ .eq(GuideReceivingSession::getGuideId, guideId)
+ .eq(GuideReceivingSession::getStatus, "IN_SERVICE")
+ .set(GuideReceivingSession::getStatus, "STOPPED"));
+ }
+ }
+
+ private boolean hasActiveServiceOrder(GuideReceivingSession session) {
+ return orderMapper.selectCount(new LambdaQueryWrapper<TourOrder>()
+ .eq(TourOrder::getGuideId, session.getGuideId())
+ .eq(TourOrder::getReceivingSessionId, session.getId())
+ .in(TourOrder::getStatus,
+ OrderStatus.PENDING_MEETING.getCode(),
+ OrderStatus.IN_SERVICE.getCode())) > 0;
}
private void saveRealtimeStatus(Long guideId, GuideReceivingStartRequest request, Long scenicId) {
@@ -242,7 +292,9 @@
}
private String normalizeMode(String mode) {
- if (!"GROUP".equals(mode) && !"PRIVATE".equals(mode)) throw new BusinessException(400, "invalid receiving mode");
+ if (!"ALL".equals(mode) && !"GROUP".equals(mode) && !"PRIVATE".equals(mode)) {
+ throw new BusinessException(400, "invalid receiving mode");
+ }
return mode;
}
--
Gitblit v1.7.1