sunyu::update::fix bug about addGoods

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

@@ -1415,6 +1415,16 @@ public class ShoppingCartMCoffeeServiceImpl {
         oldCartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType,shoppingCartGoodsResponseVo, oldCartGoodsList);
         List<CartGoods> newCartGoods = new ArrayList<>();
         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> newCartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType,shoppingCartGoodsResponseVo, newCartGoods);
         List<CartGoods> nowCartGoodsList = new ArrayList<>();
@@ -1422,7 +1432,7 @@ public class ShoppingCartMCoffeeServiceImpl {
             nowCartGoodsList.addAll(oldCartGoodsList);
         }
         if(CollectionUtils.isNotEmpty(newCartGoodsList)){
-            //判断当前商品在购物车是否已存在,存在则数量＋1,不存在商品行 + 1
+            log.info("【merge-before】:{} ,【newCardGoods】:{}",JSONObject.toJSONString(nowCartGoodsList),JSONObject.toJSONString(newCartGoods));
             newCartGoodsList.forEach(newCartGood -> {
                 int index;
                 if ((index = nowCartGoodsList.indexOf(newCartGood)) >= 0) {