Commit ec2bca7331ee24ba3315c97d02240eb0ebca8da4

Authored by YunaiV
1 parent 24a88059

!1441 【轻量级 PR】:fix: 【mall】找不到所在区域的运费收费模板和运费免费模板时(即:未配置所在区域的运费模板),不把模板对象put进result中。

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 {
85 85 .setChargeMode(template.getChargeMode())
86 86 .setCharge(convertTemplateCharge(findFirst(templateIdChargeMap.get(template.getId()), charge -> charge.getAreaIds().contains(areaId))))
87 87 .setFree(convertTemplateFree(findFirst(templateIdFreeMap.get(template.getId()), free -> free.getAreaIds().contains(areaId))));
88   - result.put(template.getId(), bo);
  88 + if (bo.getCharge() != null || bo.getFree() != null) {
  89 + result.put(template.getId(), bo);
  90 + }
89 91 });
90 92 return result;
91 93 }
... ...