Commit 241f68b3 by 姜海波

调整配送费 逻辑

parent 3bab54d2
......@@ -1041,12 +1041,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
ActivityResponseDto activityResponse = activityQueryResponseDto.getResult().get(0);
BenefitBeanDto beanDto=activityResponse.getBenefits().get(0);
if(beanDto.getDiscountAmount()>=(calculationDiscountResult.getDeliveryAmount() / 100)){
if(beanDto.getDiscountAmount()>=(calculationDiscountResult.getDeliveryAmount())){
String desc = DELIVERY_DISCOUNT_DESC2;
shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount()));
shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ));
}else{
String desc = DELIVERY_DISCOUNT_DESC1;
shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount(),calculationDiscountResult.getDeliveryAmount() / 100));
shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ,calculationDiscountResult.getDeliveryAmount() / 100));
}
shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
......
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