Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa

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

@@ -1011,7 +1011,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discount
                         = calculationDiscountResult.getDiscounts().stream()
                         .filter(discount1 -> {
-                            return discount1.getType().equals(ActivityTypeEnum.TYPE_14.getCode());
+                            return ActivityTypeEnum.TYPE_14.getCode().equals(discount1.getType());
                         })
                         .findFirst();
 
@@ -1045,7 +1045,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                             shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ));
                         }else{
                             String desc = DELIVERY_DISCOUNT_DESC1;
-                            shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ,calculationDiscountResult.getDeliveryAmount() / 100));
+                            shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ,beanDto.getDiscountAmount() / 100));
                         }
 
                         shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());