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()));