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

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

@@ -69,7 +69,8 @@ public class CalculationCommonService {
             this.rowRealAmount(goods, cartGoods);
             //成交价行记录
             //amount += find.getRealAmount() * cartGoods.getQty();
-            cartGoods.setAmount(amount);
+            amount = cartGoods.getAmount();
+            //cartGoods.setAmount(amount);
             totalAmount += amount;
             //原价行记录
             originalAmount = cartGoods.getOriginalPrice() * cartGoods.getQty();