Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

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

@@ -127,7 +127,7 @@ public class CalculationCommonService {
                     amount += mt.getRealAmount();
                     choice.setAmount(mt.getRealAmount().longValue());
                 }
-                originPrice += choice.getFinalPrice() * choice.getQty();
+                originPrice += choice.getFinalPrice() * choice.getQty()*cartGoods.getQty();
             }
             cartGoods.setAmount(cartGoods.getAmount() + amount);
         }