sunyu::update::fix bug about merge monthCard product

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

@@ -1417,11 +1417,12 @@ public class ShoppingCartMCoffeeServiceImpl {
         newCartGoods.add(addCartGoods);
 
         //如果加购的商品与购物车缓存中月享卡2.0的商品goodsId相同，则给新增商品的couponCode 赋值为月享卡2.0的券号，否则会分行展示
-        Optional<CartGoods> oldGoodsOptional = oldCartGoodsList.stream().filter(c-> c.getIsMonthCardGoods()>1).findFirst();
-        if (oldGoodsOptional.isPresent()){
-            CartGoods montCardGoods = oldGoodsOptional.get();
-            if (newCartGoods.get(0).getGoodsId().equals(montCardGoods.getGoodsId())){
-                newCartGoods.get(0).setCouponCode(montCardGoods.getCouponCode());
+        List<CartGoods> montCardGoods = oldCartGoodsList.stream().filter(c-> c.getIsMonthCardGoods()>0).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(montCardGoods)){
+            for (CartGoods montCardGood : montCardGoods) {
+                if (newCartGoods.get(0).getGoodsId().equals(montCardGood.getGoodsId())){
+                    newCartGoods.get(0).setCouponCode(montCardGood.getCouponCode());
+                }
             }
         }