Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa

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

@@ -1827,14 +1827,18 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     }
 
                     shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
-                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
+//                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);  原有逻辑
+                    // 增加配送券之后的逻辑
+                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult==null?deliveryAmount:calculationDiscountResult.getDistributionFee());
                     shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
 
                 } else {
                     String desc = DELIVERY_DISCOUNT_DESC3;
                     shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(deliveryAmount.doubleValue() / 100)));
                     shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
-                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
+//                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);  原有逻辑
+                    // 增加配送券之后的逻辑
+                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult==null?deliveryAmount:calculationDiscountResult.getDistributionFee());
                     shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
                 }
             }