Merge remote-tracking branch 'remotes/origin/feature/1.9.26_积分抵扣规则，新增是否与促销和优惠券同享' into develop

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

@@ -70,7 +70,7 @@ public class CustomerScoreService implements IPromotionService {
             if (userScoreUseDetail.getResult().getOverlayOffers() == 0) {
                 customerScoreVo.setScoreReduceState(userScoreUseDetail.getResult().getScoreState());
             } else {
-                if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || calculationDiscountResult.getTotalDiscountAmount().intValue() > 0) {
+                if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || (calculationDiscountResult != null && calculationDiscountResult.getTotalDiscountAmount().intValue() > 0)) {
                     //积分抵扣开关禁用
                     customerScoreVo.setScoreReduceState(3);
                     userScoreUseDetail.getResult().setScoreState(3);