Merge remote-tracking branch 'remotes/origin/bugfix_套餐折扣' into develop

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -167,19 +167,6 @@ public class ShoppingCartConvertAdapter {
         Long originalPrice = cartGoodsDetailDto.getOriginalPrice();
         Long discountPrice = 0L;
         int goodsTotalQty = apportionGoodsList.stream().mapToInt(apportionGoods -> apportionGoods.getGoodsQuantity()).sum();
-        Long a = 0L, b = 0L;
-        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods apportionGoods : apportionGoodsList) {
-            for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.ApportionDetails apportionDetail : apportionGoods.getApportionDetails()) {
-                if (!ActivityTypeEnum.TYPE_32.getCode().equals(apportionDetail.getActivityType())
-                        && !ActivityTypeEnum.TYPE_104.getCode().equals(apportionDetail.getActivityType())
-                        && !ActivityTypeEnum.TYPE_2.getCode().equals(apportionDetail.getActivityType())
-                        && !ActivityTypeEnum.TYPE_21.getCode().equals(apportionDetail.getActivityType())
-                ) {
-                    a = apportionDetail.getActivityApportionAmount() * apportionGoods.getGoodsQuantity();
-                }
-            }
-            b += a * cartGoodsDetailDto.getQty() / goodsTotalQty;
-        }
         for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods apportionGoods : apportionGoodsList) {
             //折扣=所有折扣和*百分比（当前行商品数量/购物车总商品数量）
             discountPrice += apportionGoods.getApportionDetails().stream().filter(d -> ObjectUtils.notEqual(ActivityTypeEnum.TYPE_32.getCode(), d.getActivityType())