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/order/mapper/TourOrderMapper.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/backend/src/main/java/com/tourguide/modules/order/mapper/TourOrderMapper.java b/backend/src/main/java/com/tourguide/modules/order/mapper/TourOrderMapper.java
index 2fba7db..80b1b37 100644
--- a/backend/src/main/java/com/tourguide/modules/order/mapper/TourOrderMapper.java
+++ b/backend/src/main/java/com/tourguide/modules/order/mapper/TourOrderMapper.java
@@ -13,6 +13,13 @@
import java.util.List;
public interface TourOrderMapper extends BaseMapper<TourOrder> {
+ String GUIDE_PAID_AMOUNT_SQL = "COALESCE(payment_amount, amount, 0)";
+ String GUIDE_REFUNDED_AMOUNT_SQL = "COALESCE(NULLIF(refunded_amount, 0), " +
+ "CASE WHEN status = 'REFUNDED' OR refund_status = 'REFUNDED' " +
+ "THEN refund_amount ELSE 0 END, 0)";
+ String GUIDE_REMAINING_AMOUNT_SQL = "GREATEST(" + GUIDE_PAID_AMOUNT_SQL + " - " +
+ GUIDE_REFUNDED_AMOUNT_SQL + ", 0)";
+
@Select("SELECT * FROM tour_order WHERE id = #{id} AND deleted = 0 FOR UPDATE")
TourOrder selectForUpdate(Long id);
@@ -22,7 +29,9 @@
@Select("SELECT COUNT(*) AS today_order_count, COALESCE(SUM(people_count), 0) AS today_people_count " +
"FROM tour_order WHERE deleted = 0 AND guide_id = #{guideId} " +
"AND accepted_at >= CURDATE() AND accepted_at < DATE_ADD(CURDATE(), INTERVAL 1 DAY) " +
- "AND status NOT IN ('CANCELLED', 'REFUNDED')")
+ "AND (status NOT IN ('CANCELLED', 'REFUNDED') " +
+ "OR (status = 'CANCELLED' AND refund_status = 'PARTIAL')) " +
+ "AND " + GUIDE_REMAINING_AMOUNT_SQL + " > 0")
GuideTodayStatsResponse selectGuideTodayStats(Long guideId);
@Select("SELECT DISTINCT scenic_name FROM tour_order WHERE deleted = 0 AND scenic_name IS NOT NULL AND scenic_name <> '' ORDER BY scenic_name")
@@ -40,19 +49,23 @@
})
List<VisitorOrderStatRow> selectVisitorOrderStats(@Param("visitorIds") Collection<Long> visitorIds);
- @Select("SELECT COALESCE(SUM(guide_earning_amount), 0) FROM tour_order " +
- "WHERE deleted = 0 AND guide_id = #{guideId} AND status = 'COMPLETED' " +
+ @Select("SELECT COALESCE(SUM(" + GUIDE_REMAINING_AMOUNT_SQL + "), 0) FROM tour_order " +
+ "WHERE deleted = 0 AND guide_id = #{guideId} " +
+ "AND (status = 'COMPLETED' OR (status = 'CANCELLED' AND refund_status = 'PARTIAL')) " +
"AND guide_earning_amount IS NOT NULL " +
- "AND (refund_status IS NULL OR refund_status IN ('NONE', 'REFUND_FAILED')) " +
+ "AND (refund_status IS NULL OR refund_status IN ('NONE', 'PARTIAL', 'REFUND_FAILED')) " +
+ "AND " + GUIDE_REMAINING_AMOUNT_SQL + " > 0 " +
"AND completed_at >= #{startTime} AND completed_at < #{endTime}")
BigDecimal selectGuideEarningSum(@Param("guideId") Long guideId,
@Param("startTime") LocalDateTime startTime,
@Param("endTime") LocalDateTime endTime);
@Select("SELECT DISTINCT scenic_name FROM tour_order " +
- "WHERE deleted = 0 AND guide_id = #{guideId} AND status = 'COMPLETED' " +
+ "WHERE deleted = 0 AND guide_id = #{guideId} " +
+ "AND (status = 'COMPLETED' OR (status = 'CANCELLED' AND refund_status = 'PARTIAL')) " +
"AND guide_earning_amount IS NOT NULL " +
- "AND (refund_status IS NULL OR refund_status IN ('NONE', 'REFUND_FAILED')) " +
+ "AND (refund_status IS NULL OR refund_status IN ('NONE', 'PARTIAL', 'REFUND_FAILED')) " +
+ "AND " + GUIDE_REMAINING_AMOUNT_SQL + " > 0 " +
"AND scenic_name IS NOT NULL AND scenic_name <> '' ORDER BY scenic_name")
List<String> selectGuideEarningScenics(Long guideId);
--
Gitblit v1.7.1