From ec2bca7331ee24ba3315c97d02240eb0ebca8da4 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 21 Nov 2025 20:04:20 +0800 Subject: [PATCH] =?UTF-8?q?!1441=20=E3=80=90=E8=BD=BB=E9=87=8F=E7=BA=A7=20?= =?UTF-8?q?PR=E3=80=91=EF=BC=9Afix:=20=E3=80=90mall=E3=80=91=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=89=80=E5=9C=A8=E5=8C=BA=E5=9F=9F=E7=9A=84?= =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=94=B6=E8=B4=B9=E6=A8=A1=E6=9D=BF=E5=92=8C?= =?UTF-8?q?=E8=BF=90=E8=B4=B9=E5=85=8D=E8=B4=B9=E6=A8=A1=E6=9D=BF=E6=97=B6?= =?UTF-8?q?=EF=BC=88=E5=8D=B3=EF=BC=9A=E6=9C=AA=E9=85=8D=E7=BD=AE=E6=89=80?= =?UTF-8?q?=E5=9C=A8=E5=8C=BA=E5=9F=9F=E7=9A=84=E8=BF=90=E8=B4=B9=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=EF=BC=89=EF=BC=8C=E4=B8=8D=E6=8A=8A=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1put=E8=BF=9Bresult=E4=B8=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../convert/delivery/DeliveryExpressTemplateConvert.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressTemplateConvert.java b/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressTemplateConvert.java index b917d874bb..3c02e8917c 100644 --- a/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressTemplateConvert.java +++ b/yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressTemplateConvert.java @@ -85,7 +85,9 @@ public interface DeliveryExpressTemplateConvert { .setChargeMode(template.getChargeMode()) .setCharge(convertTemplateCharge(findFirst(templateIdChargeMap.get(template.getId()), charge -> charge.getAreaIds().contains(areaId)))) .setFree(convertTemplateFree(findFirst(templateIdFreeMap.get(template.getId()), free -> free.getAreaIds().contains(areaId)))); - result.put(template.getId(), bo); + if (bo.getCharge() != null || bo.getFree() != null) { + result.put(template.getId(), bo); + } }); return result; }