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/order/mapper/TourOrderMapper.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 cea1a02..79565a8 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
@@ -30,7 +30,7 @@
@Select({
"<script>",
- "SELECT visitor_id AS visitorId, COUNT(*) AS orderCount, ",
+ "SELECT visitor_id AS visitorId, COUNT(CASE WHEN status NOT IN ('PENDING_PAYMENT', 'CANCELLED', 'REFUNDED') THEN 1 END) AS orderCount, ",
"COALESCE(SUM(CASE WHEN status NOT IN ('PENDING_PAYMENT', 'CANCELLED', 'REFUNDED') ",
"THEN COALESCE(payment_amount, amount) ELSE 0 END), 0) AS totalConsumption ",
"FROM tour_order WHERE deleted = 0 AND visitor_id IN ",
@@ -72,16 +72,17 @@
@Param("sessionId") Long sessionId,
@Param("completedAt") LocalDateTime completedAt);
- @Update("UPDATE tour_order SET status = 'CANCELLED', refund_status = 'REFUNDING', updated_at = NOW() " +
+ @Update("UPDATE tour_order SET status = 'CANCELLED', cancelled_at = COALESCE(cancelled_at, NOW()), refund_status = 'REFUNDING', updated_at = NOW() " +
"WHERE id = #{id} AND deleted = 0 AND status = 'PENDING_ACCEPT' " +
"AND payment_time IS NOT NULL AND (refund_status IS NULL OR refund_status = 'NONE')")
int claimUnacceptedOrderForRefund(Long id);
- @Update("UPDATE tour_order SET status = 'CANCELLED', updated_at = NOW() " +
+ @Update("UPDATE tour_order SET status = 'CANCELLED', cancelled_at = COALESCE(cancelled_at, NOW()), updated_at = NOW() " +
"WHERE id = #{id} AND deleted = 0 AND status = 'PENDING_PAYMENT'")
int cancelUnpaid(Long id);
- @Update("UPDATE tour_order SET status = 'IN_SERVICE', service_started_at = #{startedAt}, updated_at = NOW() " +
+ @Update("UPDATE tour_order SET status = 'IN_SERVICE', arrived_at = COALESCE(arrived_at, #{startedAt}), " +
+ "service_started_at = #{startedAt}, updated_at = NOW() " +
"WHERE receiving_session_id = #{sessionId} AND deleted = 0 AND status = 'PENDING_MEETING'")
int startSessionOrders(@Param("sessionId") Long sessionId, @Param("startedAt") LocalDateTime startedAt);
}
--
Gitblit v1.7.1