From e32a7d6cfbd46d682d08bf240b04aff397960199 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Tue, 10 Jun 2025 14:39:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86-=E9=80=80?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/order/business/OrderBusiness.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java index 56b314c..0e68756 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java @@ -261,9 +261,9 @@ public class OrderBusiness { } BigDecimal detailRefundAmount = orderDetail.getFinalPrice().multiply(new BigDecimal(detailParam.getQuantity())); refundAmount = refundAmount.add(detailRefundAmount); - orderDetail.setRefundAmount(detailRefundAmount); - orderDetail.setRefundNum(detailParam.getQuantity()); - if(detailParam.getQuantity().equals(orderDetail.getQuantity())){ + orderDetail.setRefundAmount(detailRefundAmount.add(orderDetail.getRefundAmount())); + orderDetail.setRefundNum(detailParam.getQuantity() + orderDetail.getRefundNum()); + if(orderDetail.getRefundNum().equals(orderDetail.getQuantity())){ orderDetail.setDetailState(OrderDetailStateEnum.REFUNDED.getKey()); }else { orderDetail.setDetailState(OrderDetailStateEnum.PART_REFUND.getKey()); @@ -278,8 +278,8 @@ public class OrderBusiness { } OrderInfo refundOrderInfo = new OrderInfo(); refundOrderInfo.setOrderId(param.getOrderId()); - refundOrderInfo.setRefundAmount(refundAmount); - if(orderInfo.getRealAmount().equals(refundAmount)){ + refundOrderInfo.setRefundAmount(refundAmount.add(orderInfo.getRefundAmount())); + if(orderInfo.getRealAmount().equals(refundOrderInfo.getRefundAmount())){ refundOrderInfo.setOrderRefundState(OrderRefundStateEnum.FINISH.getKey()); refundOrderInfo.setOrderState(OrderStateEnum.CANCEL.getKey()); }else {