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

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

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

@@ -69,8 +69,8 @@ public class CustomerScoreService implements IPromotionService {
             customerScoreVo.setReducePriceLimit(getValue(userScoreUseDetail.getResult().getReducePriceLimit()));
             customerScoreVo.setOverlayOffers(userScoreUseDetail.getResult().getOverlayOffers());
             // 是否可优惠同享{0所有订单均可抵扣,1仅限原价订单才可抵扣（享受了促销活动、或使用了优惠券，不能进行积分抵扣
-            if (userScoreUseDetail.getResult().getOverlayOffers() == 0) {
-                customerScoreVo.setScoreReduceState(userScoreUseDetail.getResult().getScoreState());
+            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()))) {