github/ruoyi-vue-pro
1
0
Fork 0
mirror of https://github.com/YunaiV/ruoyi-vue-pro.git synced 2026-03-30 03:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

Browse Source 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
This commit is contained in:
YunaiV
2025-11-21 20:04:46 +08:00
parent 2769f774a0 ec2bca7331
commit 485a70de6d
10 changed files with 72 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressTemplateConvert.java
View File

@@ -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;
}