Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/FullSharingService.java

@@ -52,7 +52,7 @@ public class FullSharingService {
         List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts = discountResult.getDiscounts();
         List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> fullDiscountsList = discounts
                 .stream()
-                .filter(d -> d.getType().equals(ActivityTypeEnum.TYPE_11.getCode()) || d.getType().equals(ActivityTypeEnum.TYPE_12))
+                .filter(d -> ActivityTypeEnum.TYPE_11.getCode().equals(d.getType()) || ActivityTypeEnum.TYPE_12.getCode().equals(d.getType()))
                 .collect(Collectors.toList());
         /**
          * 设置到响应中 总的满减优惠金额