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

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

@@ -107,7 +107,7 @@ public class CalculationCommonService {
             if (mt == null) {
                 amount = choice.getAmount() * cartGoods.getQty();
             } else {
-                amount = mt.getRealAmount();
+                amount += mt.getRealAmount();
                 choice.setAmount(mt.getRealAmount().longValue());
             }
         }