满赠问题fix

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

@@ -51,6 +51,7 @@ public class DistributeServiceImpl implements DistributeService {
         long totalOriginalAmount = 0L, totalAmount = 0L, totalPackageAmount = 0L;
         long originalAmount = 0L, amount = 0L, packageAmount = 0L;
         for (CartGoods cartGoods : cartGoodsList) {
+
             originalAmount = 0L;amount = 0L;packageAmount = 0L;
             if (CommonUtils.isProductCoupon(cartGoods.getCouponCode(), cartGoods.getCartGoodsUid())){
                 Map<String, CheckSpqInfoResponseDto> validCouponMap = discountResult.getValidCouponMap();
@@ -384,7 +385,8 @@ public class DistributeServiceImpl implements DistributeService {
             CalculationDiscountBO.CalculationDiscountResult.Goods goods = discountForGift.get(k);
             CalculationDiscountBO.CalculationDiscountResult.Goods.GoodsDiscount discount = goods.getDiscounts()
                     .stream()
-                    .filter(g -> ActivityTypeEnum.TYPE_63.getCode().equals(g.getType()) ||ActivityTypeEnum.TYPE_62.getCode().equals(g.getType()) || ActivityTypeEnum.TYPE_61.getCode().equals(g.getType()))
+                    .filter(g -> ActivityTypeEnum.TYPE_63.getCode().equals(g.getType()) ||ActivityTypeEnum.TYPE_62.getCode().equals(g.getType()) || ActivityTypeEnum.TYPE_61.getCode().equals(g.getType())
+                            || ActivityTypeEnum.TYPE_230.getCode().equals(g.getType()))
                     .findFirst()
                     .get();
             CartGoods cartGood = new CartGoods();