修复套餐商品购物车标签展示问题

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

@@ -96,10 +96,11 @@ public class MemberDiscountServiceImpl implements IPromotionService {
         for (CartGoods cartGoods : cartGoodsList) {
             //优惠总价
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = result.get(cartGoods.getCartGoodsUid());
+            if (goodsDiscount != null && goodsDiscount.getDiscount() > 0) {
                 //老促销计算价格接口套餐价购物车内部计算价格，已在套餐实现类计算好价格，这里无需再扣减
-            if (goodsDiscount != null && goodsDiscount.getDiscount() > 0 && CollectionUtils.isEmpty(cartGoods.getProductComboList())
-                    && CollectionUtils.isEmpty(cartGoods.getProductGroupList())) {
+                if (CollectionUtils.isEmpty(cartGoods.getProductComboList()) && CollectionUtils.isEmpty(cartGoods.getProductGroupList())) {
                     cartGoods.setAmount(cartGoods.getAmount() - goodsDiscount.getDiscount());
+                }
                 cartGoods.setCurrentMemberLevel(goodsDiscount.getCurrentMembershipLevel());
             }
         }