Merge branch 'feature-yu.sun-material-20201030' into qa

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

@@ -777,7 +777,9 @@ public class ShoppingCartMCoffeeServiceImpl {
                 cartGoodsList, new ArrayList<>(), new ArrayList<>(), shoppingCartGoodsResponseVo,null);
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.ADD_AND_UPDATE, null);
-
+        //再来一单清除配送费
+        shoppingCartGoodsResponseVo.setDeliveryAmount(0L);
+        shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(0L);
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }