Commit d4c883dc by yu.sun

sunyu::update::remove conpon-product about is not match threshold

parent 85452509
...@@ -80,12 +80,11 @@ public class CouponDiscountCalculation { ...@@ -80,12 +80,11 @@ public class CouponDiscountCalculation {
|| !calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType()) || !calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType()))))){ ||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType()))))){
if (null != calculationDiscountResult && CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())){ if (null != calculationDiscountResult && CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())){
for (int i=0;i<cartGoodsList.size();i++) { Iterator<CartGoods> cartGoodsIterator = cartGoodsList.iterator();
CartGoods cartGoods = cartGoodsList.get(i); while (cartGoodsIterator.hasNext()){
if (StringUtils.isNotEmpty(cartGoods.getCouponCode())) { if (StringUtils.isNotEmpty(cartGoodsIterator.next().getCouponCode())) {
cartGoods.setCouponCode(""); cartGoodsIterator.remove();
cartGoods.setCouponName(""); break;
cartGoodsList.set(i,cartGoods);
} }
} }
} }
...@@ -147,8 +146,13 @@ public class CouponDiscountCalculation { ...@@ -147,8 +146,13 @@ public class CouponDiscountCalculation {
ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = discountsNew.stream().filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType())).findFirst().get(); ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = discountsNew.stream().filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType())).findFirst().get();
cartGoods.setCouponName(goodsDiscount.getActivityName()); cartGoods.setCouponName(goodsDiscount.getActivityName());
}else{ }else{
cartGoods.setCouponCode(""); Iterator<CartGoods> cartGoodsIterator = cartGoodsList.iterator();
cartGoods.setCouponName(""); while (cartGoodsIterator.hasNext()){
if (StringUtils.isNotEmpty(cartGoodsIterator.next().getCouponCode())) {
cartGoodsIterator.remove();
break;
}
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment