Merge branch '2020/09/24-运费券-huiyang' into develop

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

@@ -378,6 +378,7 @@ public class CalculationServiceImpl {
         calculationDiscountGoods.setMemberDiscount(memberDiscount);
         //新增咖啡月卡券券号
         calculationDiscountGoods.setCouponCode(cartGoods.getCouponCode());
+        calculationDiscountGoods.setCartGoodsUid(cartGoods.getCartGoodsUid());
 
         ArrayList<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material> materials = new ArrayList<>();
         //可选搭配