From 82a8bc62d5b9d5d607f6952329952b17eda2f0a0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 14 九月 2026 15:44:34 +0800
Subject: [PATCH] update
---
backend/src/main/java/com/tourguide/modules/order/service/GuideEarningsService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/backend/src/main/java/com/tourguide/modules/order/service/GuideEarningsService.java b/backend/src/main/java/com/tourguide/modules/order/service/GuideEarningsService.java
index bb5fff5..29f226b 100644
--- a/backend/src/main/java/com/tourguide/modules/order/service/GuideEarningsService.java
+++ b/backend/src/main/java/com/tourguide/modules/order/service/GuideEarningsService.java
@@ -50,7 +50,9 @@
.eq(TourOrder::getStatus, OrderStatus.COMPLETED.getCode())
.isNotNull(TourOrder::getGuideEarningAmount)
.and(wrapper -> wrapper.isNull(TourOrder::getRefundStatus)
- .or().ne(TourOrder::getRefundStatus, RefundStatus.REFUNDED.getCode()))
+ .or().in(TourOrder::getRefundStatus,
+ Arrays.asList(RefundStatus.NONE.getCode(),
+ RefundStatus.REFUND_FAILED.getCode())))
.eq(StringUtils.hasText(scenicName), TourOrder::getScenicName,
StringUtils.hasText(scenicName) ? scenicName.trim() : null)
.ge(date != null, TourOrder::getCompletedAt, date == null ? null : date.atStartOfDay())
--
Gitblit v1.7.1