满额减配送费

615d2753 · 姜海波 · 342b8534 · 615d2753
Commit 615d2753 authored Mar 20, 2020 by 姜海波
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

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

No files found.
--- a/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+++ b/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
@@ -1001,6 +1001,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult.getDistributionFee());
                shoppingCartGoodsResponseVo.setThresholdAmount(discount.get().getThresholdAmount());
                shoppingCartGoodsResponseVo.setIsDiscountDelivery(true);
+            }else{
+                shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
+                shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
+//                shoppingCartGoodsResponseVo.setThresholdAmount(discount.get().getThresholdAmount());
+                shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
            }
        }