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

@@ -1040,7 +1040,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     ActivityResponseDto activityResponse = activityQueryResponseDto.getResult().get(0);
                     BenefitBeanDto beanDto=activityResponse.getBenefits().get(0);
 
-                    if(beanDto.getBenefitType() == 1){
+                    if(beanDto.getBenefitType() == 1||beanDto.getDiscountAmount()>=deliveryAmount){
                         String desc = DELIVERY_DISCOUNT_DESC2;
                         shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ));
                     }else{