From 5a18941a9912094c1bf0ae374530627548ad822d Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 30 Mar 2026 14:35:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/service/order/print/YxyPrinter.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java index c0f8e2dfd..d2ae997d8 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java @@ -177,7 +177,13 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl { if (isPre) { originalAmount = BigDecimal.ZERO; for (OrderDetail orderDetail : detailList) { - originalAmount = originalAmount.add((orderDetail.getNum().subtract(orderDetail.getReturnNum()).subtract(orderDetail.getRefundNum())).multiply(orderDetail.getPrice())); + if(orderDetail.getIsGift()==1){ + continue; + }else if(orderDetail.getDiscountSaleAmount().compareTo(BigDecimal.ZERO) > 0){ + originalAmount = originalAmount.add((orderDetail.getNum().subtract(orderDetail.getReturnNum()).subtract(orderDetail.getRefundNum())).multiply(orderDetail.getUnitPrice())); + }else { + originalAmount = originalAmount.add((orderDetail.getNum().subtract(orderDetail.getReturnNum()).subtract(orderDetail.getRefundNum())).multiply(orderDetail.getPrice())); + } } printInfoDTO.setOriginalAmount((originalAmount.add(orderInfo.getSeatAmount()).add(orderInfo.getPackFee())).toPlainString()); printInfoDTO.setPayAmount(originalAmount.add(orderInfo.getSeatAmount()).add(orderInfo.getPackFee())