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

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

@@ -121,7 +121,7 @@ public class FullSharingService {
                         Long md = mDiscount.get(com.getGoodsId());
                         if (md != null) {
                             com.setAmount(com.getAmount() + md);
-                            cart.setAmount(cart.getAmount() + com.getAmount());
+                            cart.setAmount(cart.getAmount() + md);
                         }
                     }
                 }