From 3b6137c5d20d06045f74e5c0efc9c86cb5e1df02 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 30 Mar 2026 10:50:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=20=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopTableMapper.xml | 2 +- .../czg/service/order/service/impl/OrderPayServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 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 bc2cbf0e8..176fba6e2 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml @@ -10,7 +10,7 @@ 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, + IFNULL(SUM( (d.num - d.return_num) * d.unit_price - d.return_amount ), 0) as orderAmount MAX(b.seat_num) as personNum, MAX(b.create_time) as orderCreateTime, MAX(ar.name) as areaName diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java index a8be9db9c..d046dff2b 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java @@ -439,7 +439,8 @@ public class OrderPayServiceImpl implements OrderPayService { } else if (isPay) { orderInfo.setStatus(OrderStatusEnums.REFUND.getCode()); } - } else { + } + else { orderInfo.setStatus(OrderStatusEnums.REFUND.getCode()); List orderDetails = orderDetailService.list( QueryWrapper.create().select(OrderDetail::getId, OrderDetail::getProductId, OrderDetail::getNum, OrderDetail::getReturnNum, OrderDetail::getPackAmount, OrderDetail::getReturnNum)