Merge branch 'feature-yu.sun-20200915-new' into qa

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

@@ -408,9 +408,9 @@ public class CalculationServiceImpl {
         long totalPackgeAmount = 0L;
         for (CartGoods cartGoods : cartGoodsList) {
             // 设置商品原价与商品现价的初始值
-            long originalAmount = (null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0) * cartGoods.getQty();
-            long amount =  (null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0) * cartGoods.getQty();
-            long packAmount =  (null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0) * cartGoods.getQty();
+            long originalAmount = null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0;
+            long amount =  null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() : 0;
+            long packAmount =  null != cartGoods.getPackPrice() ? cartGoods.getPackPrice() : 0;
             totalOriginalAmount += originalAmount;
             totalAmount += amount;
             totalPackgeAmount += packAmount;