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

!286 fix & improve

Browse Source 
Merge pull request !286 from OceansDeep/pg
This commit is contained in:
OceansDeep 2023-05-17 06:17:41 +00:00 committed by Gitee
commit 048ca0e64a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,7 +172,7 @@ public class PromotionPriceUtil {
} }
/** /**
* 特殊情况处理，如参与多个促销活动，部分商品在其他促销计算后的金额不足以满足与当前参与的促销活动的优惠金额 * 特殊情况处理，如参与多个促销活动，部分商品在其他促销计算后的金额不足以满足与当前参与的促销活动的优惠金额（只计算使用优惠券不足的情况）
* *
* @param skuVOList 获取购物车信息 * @param skuVOList 获取购物车信息
* @param skuPromotionDetail 参与活动的商品，以及商品总金额 * @param skuPromotionDetail 参与活动的商品，以及商品总金额
@ -202,7 +202,7 @@ public class PromotionPriceUtil {
double point = CurrencyUtil.div(k.getPriceDetailDTO().getGoodsPrice(), totalPrice, 4); double point = CurrencyUtil.div(k.getPriceDetailDTO().getGoodsPrice(), totalPrice, 4);
//商品优惠金额 //商品优惠金额
Double skuDiscountPrice = CurrencyUtil.mul(discountPrice, point); Double skuDiscountPrice = CurrencyUtil.mul(discountPrice, point);
return skuDiscountPrice > k.getPriceDetailDTO().getCouponPrice(); return k.getPriceDetailDTO().getCouponPrice() > 0 && skuDiscountPrice > k.getPriceDetailDTO().getCouponPrice();
} }
return false; return false;
}).collect(Collectors.toList()); }).collect(Collectors.toList());