szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【缺陷修复】商城：全局包邮判断

This commit is contained in:
puhui999 2024-11-29 14:48:19 +08:00
parent 396051b41e
commit 98989912e1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
View File

@ -122,9 +122,13 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
*/ */
private boolean isGlobalExpressFree(TradePriceCalculateRespBO result) { private boolean isGlobalExpressFree(TradePriceCalculateRespBO result) {
TradeConfigDO config = tradeConfigService.getTradeConfig(); TradeConfigDO config = tradeConfigService.getTradeConfig();
return config == null // 情况一：交易中心配置不存在默认不包邮
|| Boolean.TRUE.equals(config.getDeliveryExpressFreeEnabled()) // 开启包邮 if (config == null) {
|| result.getPrice().getPayPrice() >= config.getDeliveryExpressFreePrice(); // 满足包邮的价格 return false;
}
// 情况二：开启了全局包邮 && 满足包邮金额
return Boolean.TRUE.equals(config.getDeliveryExpressFreeEnabled()) &&
result.getPrice().getPayPrice() >= config.getDeliveryExpressFreePrice();
} }
private void calculateDeliveryPrice(List<OrderItem> selectedSkus, private void calculateDeliveryPrice(List<OrderItem> selectedSkus,