From 8c559b1c0cb9e6996ccf9c39893ba934e4f0b451 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 30 Mar 2026 10:07:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BB=93=E7=AE=97=E5=8D=95=20?= =?UTF-8?q?=E5=8E=9F=E4=BB=B7=20=E6=89=93=E5=8D=B0=E5=8D=95=E4=B8=8A?= =?UTF-8?q?=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/service/order/print/FeiPrinter.java | 2 +- .../czg/service/order/print/PrinterImpl.java | 17 ++++++++--------- .../com/czg/service/order/print/YxyPrinter.java | 13 +++++-------- .../order/service/impl/OrderPayServiceImpl.java | 4 +--- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java index 6248d7c2a..59240b7dd 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java @@ -131,7 +131,7 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl { if (StrUtil.isNotBlank(machine.getPrintQty())) { printerNum = machine.getPrintQty().split("\\^")[1]; } - + PrintInfoDTO printInfoDTO = new PrintInfoDTO().setShopName(shopInfo.getShopName()) .setCount(count) .setPrintType("普通打印").setPickupNum(getPickupNum(orderInfo)) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java index 3416f3727..daca744e3 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java @@ -18,7 +18,6 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; -import java.util.Objects; /** * 打印机具体打印方法接口，提供打印元数据获取，具体打印机实现对应方法即可 @@ -353,11 +352,11 @@ public interface PrinterImpl { .append(signLabelInfo.br); // data.append(StrUtil.format("备注：{}
", printInfoDTO.getRemark())); } - if (Objects.nonNull(printInfoDTO.getOutNumber())) { - data.append(getFormatLabel(printInfoDTO.getOutNumber(), signLabelInfo.center, signLabelInfo.qr)) - .append(signLabelInfo.br); -// data.append("".concat(printInfoDTO.getOutNumber()).concat("
")); - } +// if (Objects.nonNull(printInfoDTO.getOutNumber())) { +// data.append(getFormatLabel(printInfoDTO.getOutNumber(), signLabelInfo.center, signLabelInfo.qr)) +// .append(signLabelInfo.br); +//// data.append("".concat(printInfoDTO.getOutNumber()).concat("
")); +// } data.append(getFormatLabel(StrUtil.format("打印时间：{}", DateUtil.date().toString()), signLabelInfo.s)) .append(signLabelInfo.br) .append(signLabelInfo.br); @@ -442,8 +441,8 @@ public interface PrinterImpl { builder.append(getFormatLabel("【加急】", signLabelInfo.center, signLabelInfo.bold)) .append(signLabelInfo.br); } - builder.append(getFormatLabel("UP_ORDER_DETAIL:" + orderDetailId, signLabelInfo.center, signLabelInfo.qr)) - .append(signLabelInfo.br); +// builder.append(getFormatLabel("UP_ORDER_DETAIL:" + orderDetailId, signLabelInfo.center, signLabelInfo.qr)) +// .append(signLabelInfo.br); builder.append(signLabelInfo.br) .append(signLabelInfo.getOut(150)) .append(signLabelInfo.cut); @@ -548,7 +547,7 @@ public interface PrinterImpl { * @return 添加间距的字符串 */ default String titleAddSpace(String str, int b1) { - int k = 0; + int k; try { k = str.getBytes("GBK").length; } catch (UnsupportedEncodingException e) { 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 80284b20f..77ecceb47 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 @@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson2.JSONObject; import com.czg.account.dto.HandoverRecordDTO; import com.czg.account.entity.PrintMachine; import com.czg.account.entity.ShopInfo; @@ -174,15 +173,13 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl { printInfoDTO.setOriginalAmount((orderInfo.getOriginAmount().add(orderInfo.getSeatAmount()).add(orderInfo.getPackFee())).toPlainString()); if (isPre) { - if (orderInfo.getPlaceNum() == 1) { - 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()); + BigDecimal originalAmount = BigDecimal.ZERO; + for (OrderDetail orderDetail : detailList) { + originalAmount = originalAmount.add((orderDetail.getNum().subtract(orderDetail.getReturnNum()).subtract(orderDetail.getRefundNum())).multiply(orderDetail.getPrice())); } - printInfoDTO.setPayAmount(printInfoDTO.getOriginalAmount()); + printInfoDTO.setOriginalAmount(originalAmount.add(orderInfo.getSeatAmount()).add(orderInfo.getPackFee()).toPlainString()); } + printInfoDTO.setPayAmount(printInfoDTO.getOriginalAmount()); printInfoDTO.setPrintTitle(printInfoDTO.getPrintTitle()); if (orderInfo.getSeatNum() != null && orderInfo.getSeatAmount().compareTo(BigDecimal.ZERO) > 0) { printInfoDTO.setSeatNum(orderInfo.getSeatNum().toString()); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java index 4ba1d20f5..a8be9db9c 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java @@ -415,6 +415,7 @@ public class OrderPayServiceImpl implements OrderPayService { } else { orderDetail.setStatus(OrderStatusEnums.PART_REFUND.getCode()); } + orderDetail.setReturnAmount(orderDetail.getReturnAmount().add(refundDetail.getReturnAmount())); } else { orderDetail.setReturnNum(orderDetail.getReturnNum().add(refNum)); if (orderDetail.getPackNumber().compareTo(BigDecimal.ZERO) > 0 && orderDetail.getPackNumber().compareTo(orderDetail.getNum().subtract(orderDetail.getReturnNum())) > 0) { @@ -423,12 +424,9 @@ public class OrderPayServiceImpl implements OrderPayService { } orderDetail.setRefundNo(refPayOrderNo); orderDetail.setRefundRemark(orderDetail.getRefundRemark() + param.getRefundReason()); -// if (isPay) { - orderDetail.setReturnAmount(orderDetail.getReturnAmount().add(refundDetail.getReturnAmount())); if (orderDetail.getReturnAmount().compareTo(orderDetail.getPayAmount()) > 0) { orderDetail.setReturnAmount(orderDetail.getPayAmount()); } -// } orderDetailService.updateById(orderDetail); if (orderDetail.getProductId() != null && orderDetail.getProductId() > 0) { returnProMap.put(Convert.toStr(orderDetail.getProductId()), refundDetail.getNum());