Skip to content

O
order-group
Commit 753f1607 by xiaoer.li
Options

fix:空指针

parent 6008f9d6
Showing with 2 additions and 2 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CustomerScoreService.java
...@@ -67,8 +67,8 @@ public class CustomerScoreService implements IPromotionService { ...@@ -67,8 +67,8 @@ public class CustomerScoreService implements IPromotionService {
customerScoreVo.setReducePriceLimit(getValue(userScoreUseDetail.getResult().getReducePriceLimit())); customerScoreVo.setReducePriceLimit(getValue(userScoreUseDetail.getResult().getReducePriceLimit()));
customerScoreVo.setOverlayOffers(userScoreUseDetail.getResult().getOverlayOffers()); customerScoreVo.setOverlayOffers(userScoreUseDetail.getResult().getOverlayOffers());
// 是否可优惠同享{0所有订单均可抵扣,1仅限原价订单才可抵扣（享受了促销活动、或使用了优惠券，不能进行积分抵扣 // 是否可优惠同享{0所有订单均可抵扣,1仅限原价订单才可抵扣（享受了促销活动、或使用了优惠券，不能进行积分抵扣
if (userScoreUseDetail.getResult().getOverlayOffers() == 0) { if (getValue(userScoreUseDetail.getResult().getOverlayOffers()) == 0) {
customerScoreVo.setScoreReduceState(userScoreUseDetail.getResult().getScoreState()); customerScoreVo.setScoreReduceState(getValue(userScoreUseDetail.getResult().getScoreState()));
} else { } else {
if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || (calculationDiscountResult != null && calculationDiscountResult.getTotalDiscountAmount().intValue() > 0)) { if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || (calculationDiscountResult != null && calculationDiscountResult.getTotalDiscountAmount().intValue() > 0)) {
//积分抵扣开关禁用 //积分抵扣开关禁用
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment