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

@@ -72,8 +72,8 @@ public class CustomerScoreService implements IPromotionService {
             } else {
                 if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || (calculationDiscountResult != null && calculationDiscountResult.getTotalDiscountAmount().intValue() > 0)) {
                     //积分抵扣开关禁用
-                    customerScoreVo.setScoreReduceState(3);
-                    userScoreUseDetail.getResult().setScoreState(3);
+                    customerScoreVo.setScoreReduceState(5);
+                    userScoreUseDetail.getResult().setScoreState(5);
                     discountAmount = 0;
                 }
             }
@@ -90,7 +90,7 @@ public class CustomerScoreService implements IPromotionService {
                     String[] split = userScoreUseDetail.getResult().getScoreReduceRate().split(":");
                     msg = String.format("共%s积分，每%s积分可抵¥%s", getValue(userScoreUseDetail.getResult().getCurrentScore()), split[0], split[1]);
                     break;
-                case 3:
+                case 5:
                     msg = "已享受优惠，无法再参与积分抵扣";
                     break;
                 case 4: