Merge branch 'feature/20191119_套餐特价'

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

@@ -532,7 +532,7 @@ public class CouponServiceImpl implements CouponService {
             // 数量
             product.setQuantity(cartGood.getQty());
             productList.add(product);
-            totalAmount = totalAmount + cartGood.getOriginalPrice() * cartGood.getQty();
+            totalAmount = totalAmount +product.getAmount() * cartGood.getQty();
         }
         return totalAmount;
     }