From 39f6fca28e3f78abe48f08e474ec011abb990b36 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 09 九月 2026 10:39:21 +0800
Subject: [PATCH] update
---
backend/src/main/java/com/tourguide/modules/finance/service/AdminFinanceService.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/backend/src/main/java/com/tourguide/modules/finance/service/AdminFinanceService.java b/backend/src/main/java/com/tourguide/modules/finance/service/AdminFinanceService.java
index d4081b0..6bb8b48 100644
--- a/backend/src/main/java/com/tourguide/modules/finance/service/AdminFinanceService.java
+++ b/backend/src/main/java/com/tourguide/modules/finance/service/AdminFinanceService.java
@@ -149,12 +149,23 @@
String teamName = teamId == null ? "个人导游" : teams.get(teamId);
return new FinanceLedgerResponse(order.getId(),
refund ? order.getRefundOrderNo() : "IN" + order.getOrderNo(), order.getOrderNo(),
- paymentAmount(order), platformIncome, guideIncome, order.getGuideName(), order.getGuideMobile(),
+ paymentAmount(order), platformIncome, guideIncome, guideName(order, guide), guideMobile(order, guide),
teamName, refund ? order.getRefundOrderNo() : order.getPaymentOrderNo(),
refund ? order.getRefundMethod() : order.getPaymentMethod(), amount,
refund ? order.getRefundTime() : order.getPaymentTime(), settledAt);
}
+ private String guideName(TourOrder order, GuideUser guide) {
+ return StringUtils.hasText(order.getGuideName())
+ ? order.getGuideName() : guide == null ? null
+ : StringUtils.hasText(guide.getRealName()) ? guide.getRealName() : guide.getUsername();
+ }
+
+ private String guideMobile(TourOrder order, GuideUser guide) {
+ return StringUtils.hasText(order.getGuideMobile())
+ ? order.getGuideMobile() : guide == null ? null : guide.getMobile();
+ }
+
private Map<Long, GuideUser> loadGuides(List<TourOrder> orders) {
Set<Long> guideIds = orders.stream().map(TourOrder::getGuideId)
.filter(id -> id != null).collect(Collectors.toSet());
--
Gitblit v1.7.1