打印问题2

cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java

@@ -92,17 +92,13 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl {
         if (StrUtil.isNotBlank(machine.getPrintQty())) {
             printerNum = machine.getPrintQty().split("\\^")[1];
         }
-        BigDecimal refundAmount = BigDecimal.ZERO;
-        for (OrderDetail orderDetail : detailList) {
-            refundAmount = refundAmount.add(orderDetail.getReturnAmount());
-        }
 
         PrintInfoDTO printInfoDTO = new PrintInfoDTO().setShopName(shopInfo.getShopName())
                 .setPrintType("普通打印").setPickupNum(getPickupNum(orderInfo))
                 .setOrderNo(orderInfo.getOrderNo())
                 .setTradeDate(DateUtil.format(orderInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss"))
                 .setOperator("【POS-1】001").setPayAmount(orderInfo.getPayAmount().toPlainString())
-                .setOriginalAmount((orderInfo.getOriginAmount().add(orderInfo.getSeatAmount()).add(orderInfo.getPackFee()).subtract(refundAmount)).toPlainString())
+                .setOriginalAmount((orderInfo.getOriginAmount().add(orderInfo.getSeatAmount()).add(orderInfo.getPackFee())).toPlainString())
                 .setReturn(isReturn(orderInfo))
                 .setBalance(balance)
                 .setPayType((ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType()))

cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java

@@ -156,15 +156,11 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
                 .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
                 .eq(OrderInfo::getShopId, orderInfo.getShopId())
                 .le(OrderInfo::getCreateTime, orderInfo.getCreateTime()));
-        BigDecimal refundAmount = BigDecimal.ZERO;
+
-        for (OrderDetail orderDetail : detailList) {
-            refundAmount = refundAmount.add(orderDetail.getReturnAmount());
-        }
         PrintInfoDTO printInfoDTO = new PrintInfoDTO().setShopName(shopInfo.getShopName())
                 .setPrintType("普通打印").setPickupNum(getPickupNum(orderInfo))
                 .setOrderNo(orderInfo.getOrderNo()).setTradeDate(DateUtil.format(orderInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss"))
                 .setOperator("【POS-1】001").setPayAmount(orderInfo.getPayAmount().toPlainString())
-                .setOriginalAmount((orderInfo.getOriginAmount().add(orderInfo.getSeatAmount()).add(orderInfo.getPackFee()).subtract(refundAmount)).toPlainString())
                 .setReturn(isReturn(orderInfo))
                 .setBalance(balance).setPayType((ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType())).setIntegral("0")
                 .setOutNumber(orderInfo.getTakeCode())
@@ -175,9 +171,17 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
                 .setDiscountAmount(orderInfo.getDiscountAllAmount() != null 
                     ? orderInfo.getDiscountAllAmount().toPlainString() 
                     : "0.00");
+
+        printInfoDTO.setOriginalAmount((orderInfo.getOriginAmount().add(orderInfo.getSeatAmount()).add(orderInfo.getPackFee())).toPlainString());
         if (isPre) {
             // 设置支付金额为 订单原价-订单优惠金额
             printInfoDTO.setPayAmount((new BigDecimal(printInfoDTO.getOriginalAmount()).subtract(new BigDecimal(printInfoDTO.getDiscountAmount()))).toPlainString());
+
+            BigDecimal refundAmount = BigDecimal.ZERO;
+            for (OrderDetail orderDetail : detailList) {
+                refundAmount = refundAmount.add(orderDetail.getReturnAmount());
+            }
+            printInfoDTO.setOriginalAmount((orderInfo.getOriginAmount().add(orderInfo.getSeatAmount()).add(orderInfo.getPackFee()).subtract(refundAmount)).toPlainString());
         }
         printInfoDTO.setPrintTitle(printInfoDTO.getPrintTitle());
         if (orderInfo.getSeatNum() != null && orderInfo.getSeatAmount().compareTo(BigDecimal.ZERO) > 0) {