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

@@ -114,7 +114,7 @@ public class FullSharingService {
             //可选商品
             if (CollectionUtils.isNotEmpty(cart.getProductGroupList())) {
                 List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.SmallMaterial> materialDiscount = discountMap.getSmallMaterial();
-                HashMap<String, Long> mDiscount = drawnFullDiscount(materialDiscount, typeEnums,1);
+                HashMap<String, Long> mDiscount = drawnFullDiscount(materialDiscount, typeEnums, 2);
                 if (!mDiscount.isEmpty()) continue;
                 for (CartGoods.ComboxGoods com : cart.getProductGroupList()) {
                     Long md = mDiscount.get(com.getGoodsId());