From 24c548de19faf339ef0119107987f7930eee6000 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sat, 15 Mar 2025 16:55:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E8=B4=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/service/order/service/impl/PayServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index 650ba8e6..273098b7 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -560,7 +560,7 @@ public class PayServiceImpl implements PayService { orderDetail.setRefundRemark(orderDetail.getRefundRemark() + param.getRefundReason()); if (isPay) { orderDetail.setReturnAmount(refundDetail.getReturnAmount().add(refundDetail.getReturnAmount())); - if(orderDetail.getReturnAmount().compareTo(orderDetail.getPayAmount()) > 0){ + if (orderDetail.getReturnAmount().compareTo(orderDetail.getPayAmount()) > 0) { orderDetail.setReturnAmount(orderDetail.getPayAmount()); } } @@ -581,7 +581,7 @@ public class PayServiceImpl implements PayService { orderInfo.setStatus(OrderStatusEnums.REFUND.getCode()); // ssss List orderDetails = orderDetailService.queryChain() - .select(OrderDetail::getId, OrderDetail::getProductId, OrderDetail::getNum, OrderDetail::getReturnNum, OrderDetail::getReturnNum) + .select(OrderDetail::getId, OrderDetail::getProductId, OrderDetail::getNum, OrderDetail::getReturnNum, OrderDetail::getPackAmount, OrderDetail::getReturnNum) .eq(OrderDetail::getOrderId, orderInfo.getId()) .list(); for (OrderDetail orderDetail : orderDetails) {