Commit 615728ee by 孙昱

sunyu::update::fix bug about clear month-card information

parent 25f1908e
...@@ -546,8 +546,9 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -546,8 +546,9 @@ public class ShoppingCartMCoffeeServiceImpl {
return ResponseUtil.success(shoppingCartGoodsResponseVo); return ResponseUtil.success(shoppingCartGoodsResponseVo);
} }
if (cartGoodsUid.equals(cartGoods_.getCartGoodsUid())) { if (cartGoodsUid.equals(cartGoods_.getCartGoodsUid())) {
if (StringUtils.equals(cartGoods_.getSkuId(),"9999") && StringUtils.equals(cartGoods_.getSpuId(),"9999") && qty == 0){ if (cartGoods_.getIsMonthCard() == 1 && qty == 0){
clearMonthCouponInfo(cartGoodsList,cartGoods_.getCouponCode()); clearMonthCouponInfo(cartGoodsList,cartGoods_.getCouponCode());
break;
} }
cartGoods = cartGoods_; cartGoods = cartGoods_;
cartGoods_.setQty(qty); cartGoods_.setQty(qty);
...@@ -2339,11 +2340,12 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -2339,11 +2340,12 @@ public class ShoppingCartMCoffeeServiceImpl {
* @param cartGoods * @param cartGoods
* @param couponCode * @param couponCode
*/ */
private void clearMonthCouponInfo(List<CartGoods> cartGoods,String couponCode){ private List<CartGoods> clearMonthCouponInfo(List<CartGoods> cartGoods,String couponCode){
for (CartGoods cartGood : cartGoods) { for (CartGoods cartGood : cartGoods) {
if (StringUtils.equals(cartGood.getCouponCode(),couponCode)){ if (StringUtils.equals(cartGood.getCouponCode(),couponCode)){
cartGood.setCouponCode(""); cartGood.setCouponCode("");
} }
} }
return cartGoods.stream().filter(t-> !StringUtils.equals("9999",t.getSkuId())).collect(Collectors.toList());
} }
} }
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