积分抵扣空指针问题

4a7ab7de · 胡敬轩 · 0ad7494f · 4a7ab7de
Commit 4a7ab7de authored Jul 15, 2021 by 胡敬轩
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 2 deletions

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/ScoreSharingService.java
+1 -2

No files found.
--- a/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/ScoreSharingService.java
+++ b/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/ScoreSharingService.java
@@ -77,8 +77,7 @@ public class ScoreSharingService {
            if (getValue(userScoreUseDetail.getResult().getOverlayOffers()) == 0) {
                customerScoreVo.setScoreReduceState(getValue(userScoreUseDetail.getResult().getScoreState()));
            } else {
-                if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || (discountResult != null && discountResult.getTotalDiscountAmount().intValue() > 0)
+                if (discountResult != null && !CollectionUtils.isEmpty(discountResult.getDiscounts())) {
-                        || (discountResult != null && !CollectionUtils.isEmpty(discountResult.getDiscounts()))) {
                    //是否有换购
                    int type81 = 0;
                    for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount discount : discountResult.getDiscounts()) {