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

@@ -89,6 +89,7 @@ public class CustomerScoreService implements IPromotionService {
                         customerScoreVo.setScoreReduceState(5);
                         userScoreUseDetail.getResult().setScoreState(5);
                         discountAmount = 0;
+                        customerScoreVo.setReduceAmount(0);
                     }
                 }
             }