台桌 金额
This commit is contained in:
@@ -10,7 +10,7 @@
|
|||||||
MAX(b.id) as orderId,
|
MAX(b.id) as orderId,
|
||||||
MAX(b.user_id) as user_id,
|
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.seat_num) as personNum,
|
||||||
MAX(b.create_time) as orderCreateTime,
|
MAX(b.create_time) as orderCreateTime,
|
||||||
MAX(ar.name) as areaName
|
MAX(ar.name) as areaName
|
||||||
|
|||||||
@@ -439,7 +439,8 @@ public class OrderPayServiceImpl implements OrderPayService {
|
|||||||
} else if (isPay) {
|
} else if (isPay) {
|
||||||
orderInfo.setStatus(OrderStatusEnums.REFUND.getCode());
|
orderInfo.setStatus(OrderStatusEnums.REFUND.getCode());
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
orderInfo.setStatus(OrderStatusEnums.REFUND.getCode());
|
orderInfo.setStatus(OrderStatusEnums.REFUND.getCode());
|
||||||
List<OrderDetail> orderDetails = orderDetailService.list(
|
List<OrderDetail> orderDetails = orderDetailService.list(
|
||||||
QueryWrapper.create().select(OrderDetail::getId, OrderDetail::getProductId, OrderDetail::getNum, OrderDetail::getReturnNum, OrderDetail::getPackAmount, OrderDetail::getReturnNum)
|
QueryWrapper.create().select(OrderDetail::getId, OrderDetail::getProductId, OrderDetail::getNum, OrderDetail::getReturnNum, OrderDetail::getPackAmount, OrderDetail::getReturnNum)
|
||||||
|
|||||||
Reference in New Issue
Block a user