Skip to content

O
order-group
Commit 497cb291 by 姜海波
Options

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

parents 3906b3ba bc969aca
Showing with 1 additions and 1 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
...@@ -1040,7 +1040,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1040,7 +1040,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
ActivityResponseDto activityResponse = activityQueryResponseDto.getResult().get(0); ActivityResponseDto activityResponse = activityQueryResponseDto.getResult().get(0);
BenefitBeanDto beanDto=activityResponse.getBenefits().get(0); BenefitBeanDto beanDto=activityResponse.getBenefits().get(0);
if(beanDto.getBenefitType() == 1){ if(beanDto.getBenefitType() == 1||beanDto.getDiscountAmount()>=deliveryAmount){
String desc = DELIVERY_DISCOUNT_DESC2; String desc = DELIVERY_DISCOUNT_DESC2;
shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 )); shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ));
}else{ }else{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment