积分抵扣,优惠信息为空判断

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CustomerScoreService.java

@@ -74,8 +74,8 @@ public class CustomerScoreService implements IPromotionService {
             if (getValue(userScoreUseDetail.getResult().getOverlayOffers()) == 0) {
                 customerScoreVo.setScoreReduceState(getValue(userScoreUseDetail.getResult().getScoreState()));
             } else {
-                if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || (calculationDiscountResult != null && calculationDiscountResult.getTotalDiscountAmount().intValue() > 0)
-                        || (calculationDiscountResult != null && !CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts()))) {
+                if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || (calculationDiscountResult != null && calculationDiscountResult.getTotalDiscountAmount().intValue() > 0)) {
+                    if (calculationDiscountResult != null && !CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())){
                         //是否有换购
                         int type81 = 0;
                         for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount : calculationDiscountResult.getDiscounts()) {
@@ -109,6 +109,8 @@ public class CustomerScoreService implements IPromotionService {
                             customerScoreVo.setReduceAmount(0);
                         }
                     }
+
+                }
             }
 
             customerScoreVo.setUseScore(getValue(userScoreUseDetail.getResult().getUseScore()));