Merge remote-tracking branch 'origin/qa' into qa

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

@@ -397,8 +397,8 @@ public class CalculationCommonService {
             List<ShoppingCartGoodsDto.CartGoodsDetailDto> comboLists = this.com2DetailGoods(gxDiscount, cartGoods.getProductComboList(), cartGoods, true);
             combs.addAll(comboLists);
             cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
-            originalPriceSum = comboLists.stream().mapToLong(ShoppingCartGoodsDto.CartGoodsDetailDto::getOriginalPrice).sum();
-            cartGoodsDetailDto.setOriginalPrice(originalPriceSum);
+            //originalPriceSum = comboLists.stream().mapToLong(ShoppingCartGoodsDto.CartGoodsDetailDto::getOriginalPrice).sum();
+            //cartGoodsDetailDto.setOriginalPrice(originalPriceSum);
         }
         /**
          * 可选商品
@@ -452,7 +452,7 @@ public class CalculationCommonService {
             com.setExtraList(cartGoodsExtras);
             if (isFixed) {
                 com.setOriginalPrice(comb.getFinalPrice());
-                com.setQty(cartGoods.getQty());
+                com.setQty(comb.getQty() * cartGoods.getQty());
             } else {
                 com.setQty(comb.getQty() * cartGoods.getQty());
                 com.setOriginalPrice(comb.getFinalPrice());