caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
Chopper711 2023-05-11 11:21:34 +08:00
commit 4f8d4f7a74
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/src/main/java/cn/lili/modules/order/cart/render/util/PromotionPriceUtil.java
View File

@ -207,9 +207,12 @@ public class PromotionPriceUtil {
return false; return false;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
if (!unEnoughSku.isEmpty()) { if (!unEnoughSku.isEmpty()) {
if (unEnoughSku.size() == skuVOList.size()) {
return;
}
for (CartSkuVO cartSkuVO : skuVOList) { for (CartSkuVO cartSkuVO : skuVOList) {
if (unEnoughSku.isEmpty()) { if (unEnoughSku.isEmpty()) {
return; break;
} }
if (skuPromotionDetail.containsKey(cartSkuVO.getGoodsSku().getId()) && unEnoughSku.stream().noneMatch(k -> k.getGoodsSku().getId().equals(cartSkuVO.getGoodsSku().getId()))) { if (skuPromotionDetail.containsKey(cartSkuVO.getGoodsSku().getId()) && unEnoughSku.stream().noneMatch(k -> k.getGoodsSku().getId().equals(cartSkuVO.getGoodsSku().getId()))) {
// 商品金额占比 // 商品金额占比