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

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartCustomerScoreVo.java

@@ -25,5 +25,5 @@ public class ShoppingCartCustomerScoreVo {
     /**
      * 是否可优惠同享{0所有订单均可抵扣,1仅限原价订单才可抵扣（享受了促销活动、或使用了优惠券，不能进行积分抵扣)
      */
-    private String overlayOffers;
+    private Integer overlayOffers;
 }

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

@@ -65,6 +65,7 @@ public class CustomerScoreService implements IPromotionService {
             customerScoreVo.setCurrentScore(getValue(userScoreUseDetail.getResult().getCurrentScore()));
             customerScoreVo.setReduceAmount(getValue(userScoreUseDetail.getResult().getReduceAmount()));
             customerScoreVo.setReducePriceLimit(getValue(userScoreUseDetail.getResult().getReducePriceLimit()));
+            customerScoreVo.setOverlayOffers(userScoreUseDetail.getResult().getOverlayOffers());
             // 是否可优惠同享{0所有订单均可抵扣,1仅限原价订单才可抵扣（享受了促销活动、或使用了优惠券，不能进行积分抵扣
             if (userScoreUseDetail.getResult().getOverlayOffers() == 0) {
                 customerScoreVo.setScoreReduceState(userScoreUseDetail.getResult().getScoreState());
@@ -72,6 +73,7 @@ public class CustomerScoreService implements IPromotionService {
                 if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || calculationDiscountResult.getTotalDiscountAmount().intValue() > 0) {
                     //积分抵扣开关禁用
                     customerScoreVo.setScoreReduceState(3);
+                    userScoreUseDetail.getResult().setScoreState(3);
                     discountAmount = 0;
                 }
             }