From 324ff636559b5457e1134fc93df6aef13c1e1d2f Mon Sep 17 00:00:00 2001 From: wangfukang <15630117759@163.com> Date: Tue, 22 Sep 2026 13:46:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8B=BC=E5=9B=A2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cc/hiver/mall/utils/DaQuReceiptRenderUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/DaQuReceiptRenderUtil.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/DaQuReceiptRenderUtil.java index 14974025..36c5e04d 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/DaQuReceiptRenderUtil.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/DaQuReceiptRenderUtil.java @@ -29,7 +29,7 @@ public final class DaQuReceiptRenderUtil { centerLarge(sb, orderNo(order)); centerLarge(sb, orderTypeText(order, delivery, refundPrint, forcedOrderPrint, scanVerifyPrint)); if (delivery != null && Integer.valueOf(1).equals(delivery.getAppointmentDelivery())) { - left(sb, "要求送达时间:"); + largeLeft(sb, "要求送达时间:"); largeLeft(sb, formatAppointmentTime(delivery.getMustFinishTime())); } if (isFaceToFaceDelivery(order)) { @@ -38,7 +38,7 @@ public final class DaQuReceiptRenderUtil { left(sb, defaultString(order.getShopName())); left(sb, "下单时间:" + formatTime(order.getCreateTime())); if (!hasRefund) { - if (Integer.valueOf(1).equals(order.getDeliveryType())) { + if (Integer.valueOf(1).equals(order.getDeliveryType()) && !Integer.valueOf(1).equals(delivery.getAppointmentDelivery())) { left(sb, "预计送达时间:" + formatTime(delivery == null ? null : delivery.getMustFinishTime())); } else if (Integer.valueOf(1).equals(order.getUserRequireMake())) { left(sb, "核销时间:" + formatTime(order.getCreateTime()));