Commit 91e58071 by 孙昱

sunyu::update::fix bug about updateGoodsQty

parent 51c8dd4b
...@@ -562,7 +562,7 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -562,7 +562,7 @@ public class ShoppingCartMCoffeeServiceImpl {
} }
if (cartGoodsUid.equals(cartGoods_.getCartGoodsUid())) { if (cartGoodsUid.equals(cartGoods_.getCartGoodsUid())) {
if (cartGoods_.getIsMonthCard() == 1 && qty == 0){ if (cartGoods_.getIsMonthCard() == 1 && qty == 0){
cartGoodsList = clearMonthCouponInfo(cartGoodsList,cartGoods_.getCouponCode()); cartGoodsList = clearMonthCouponInfo(cartGoodsList,cartGoods_.getMonthCardInfo().getCardCode(),cartGoodsUid);
} }
cartGoods = cartGoods_; cartGoods = cartGoods_;
cartGoods_.setQty(qty); cartGoods_.setQty(qty);
...@@ -2340,13 +2340,13 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -2340,13 +2340,13 @@ public class ShoppingCartMCoffeeServiceImpl {
* @param cartGoods * @param cartGoods
* @param couponCode * @param couponCode
*/ */
private List<CartGoods> clearMonthCouponInfo(List<CartGoods> cartGoods,String couponCode){ private List<CartGoods> clearMonthCouponInfo(List<CartGoods> cartGoods,String couponCode,String cartGoodsUid){
for (CartGoods cartGood : cartGoods) { for (CartGoods cartGood : cartGoods) {
if (StringUtils.equals(cartGood.getCouponCode(),couponCode)){ if (StringUtils.equals(couponCode,cartGood.getCouponCode())){
cartGood.setCouponCode(null); cartGood.setCouponCode(null);
cartGood.setIsMonthCardGoods(0); cartGood.setIsMonthCardGoods(0);
} }
} }
return cartGoods.stream().filter(t-> !StringUtils.equals("9999",t.getSkuId())).collect(Collectors.toList()); return cartGoods.stream().filter(t-> !StringUtils.equals("9999",t.getSkuId()) && !t.getCartGoodsUid().equals(cartGoodsUid)).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