满额减配送费

b9cd30a5 · 姜海波 · 615d2753 · b9cd30a5
Commit b9cd30a5 authored Mar 20, 2020 by 姜海波
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+2 -1

No files found.
--- a/order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+++ b/order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
@@ -136,6 +136,7 @@ public class OrderAdapter {
        long discountDeliveryAmount = 0;
        if (deliveryInfoDto != null) {
            deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
+            discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
            if(shoppingCartGoodsDto.getIsDiscountDelivery() && deliveryAmount>shoppingCartGoodsDto.getDiscountDeliveryAmount()){
                discountDeliveryAmount = shoppingCartGoodsDto.getDiscountDeliveryAmount();

@@ -605,7 +606,7 @@ public class OrderAdapter {
        long discountDeliveryAmount = 0;
        if (userDeliveryInfoDto != null) {
            deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
-
+            discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
            if(shoppingCartGoodsDto.getIsDiscountDelivery() && deliveryAmount>shoppingCartGoodsDto.getDiscountDeliveryAmount()){
                discountDeliveryAmount = shoppingCartGoodsDto.getDiscountDeliveryAmount();