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

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

@@ -198,7 +198,7 @@ public class CalculationSharingCartService {
             long row = 0L;
             if (CollectionUtils.isEmpty(cartGoods.getProductGroupList())) continue;
             for (CartGoods.ComboxGoods com : cartGoods.getProductGroupList()) {
-                row += com.getAmount();
+                row += com.getAmount() * com.getQty();
             }
             cartGoods.setAmount(cartGoods.getAmount()+row);
         }