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

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

@@ -84,7 +84,8 @@ public class CustomerScoreService implements IPromotionService {
                         }
                     }
                     //积分抵扣开关禁用 过滤换购
-                    if (type81 == 0 || (type81 == 1 && !CollectionUtils.isEmpty(shoppingCartInfoRequestVo.getSendGoods()))) {
+                    if (type81 == 0 || (type81 == 1 && !CollectionUtils.isEmpty(shoppingCartInfoRequestVo.getSendGoods()))
+                            || (type81 == 1 && calculationDiscountResult.getDiscounts().size() > 1)) {
                         customerScoreVo.setScoreReduceState(5);
                         userScoreUseDetail.getResult().setScoreState(5);
                         discountAmount = 0;