From 60b961c5c17b942d5637bec8c86a8acf0282e321 Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Sat, 28 Mar 2026 16:06:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E8=AE=A2=E5=8D=95=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/ShopTableMapper.xml | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
index 9bbb2e4e3..bc2cbf0e8 100644
--- a/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
@@ -5,12 +5,25 @@
 <mapper namespace="com.czg.service.account.mapper.ShopTableMapper">
 
     <select id="pageInfo" resultType="com.czg.account.vo.ShopTableVO">
-        select a.*, b.id orderId, b.user_id, b.origin_amount as orderAmount, b.seat_num as personNum, b.create_time as orderCreateTime, ar.name as areaName
+        select
+        a.*,
+        MAX(b.id) as orderId,
+        MAX(b.user_id) as user_id,
+        -- 核心：真实金额 = 支付总额 - 退款总额
+        IFNULL(SUM(d.pay_amount), 0) - IFNULL(SUM(d.return_amount), 0) as orderAmount,
+        MAX(b.seat_num) as personNum,
+        MAX(b.create_time) as orderCreateTime,
+        MAX(ar.name) as areaName
         from tb_shop_table as a
         left join tb_order_info as b
-        on a.table_code = b.table_code and b.`status` = 'unpaid' and b.table_code != '' and
-        b.table_code is not null
-        left join tb_shop_table_area as ar on a.area_id = ar.id
+        on a.table_code = b.table_code
+        and b.`status` = 'unpaid'
+        and b.table_code != ''
+        and b.table_code is not null
+        left join tb_order_detail as d
+        on b.id = d.order_id
+        left join tb_shop_table_area as ar
+        on a.area_id = ar.id
         where a.shop_id=#{shopId}
         <if test="areaId != null">
             and a.area_id=#{areaId}
@@ -29,6 +42,5 @@
         </if>
         group by a.id
         ORDER BY a.area_id,a.id
-
     </select>
 </mapper>