配送费bug

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/AbstractApportionService.java

@@ -778,7 +778,7 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
                 String desc = DELIVERY_DISCOUNT_DESC1;
                 deliveryBO.setDeliveryDiscountDesc(String.format(desc, df.format(beanDto.getThresholdAmount().doubleValue() /100) ,df.format(beanDto.getDiscountAmount().doubleValue() / 100)));
             }
-            deliveryBO.setDeliveryAmount(discountResult.getDeliveryAmount());
+            deliveryBO.setDeliveryAmount(deliveryAmount);
             deliveryBO.setDiscountDeliveryAmount(discountResult.getDistributionFee());
             deliveryBO.setThresholdAmount(discount.getThresholdAmount());
             deliveryBO.setIsDiscountDelivery(true);

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/DeliverySharingService.java

@@ -66,7 +66,7 @@ public class DeliverySharingService {
                 String desc = DELIVERY_DISCOUNT_DESC1;
                 shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(beanDto.getThresholdAmount().doubleValue() /100) ,df.format(beanDto.getDiscountAmount().doubleValue() / 100)));
             }
-            shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
+            shoppingCartGoodsResponseVo.setDeliveryAmount(discountResult.getDeliveryAmount());
             shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(discountResult.getDistributionFee());
             shoppingCartGoodsResponseVo.setThresholdAmount(discount.getThresholdAmount());
             shoppingCartGoodsResponseVo.setIsDiscountDelivery(true);