sunyu::update::fix bug about monthCard 2.0

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

@@ -732,6 +732,12 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 促销活动的优惠金额计算
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
                 cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo, payCardPrice);
+        
+        //如果促销返回的商品里有月享卡2.0的虚拟商品，重新保存一次购物车
+        if(CollectionUtils.isNotEmpty(cartGoodsList) && cartGoodsList.stream().anyMatch(cartGoods -> cartGoods.getSkuId().equals("9999"))){
+            // 重新存储最新购物车
+            assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
+        }
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
 

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

@@ -110,6 +110,7 @@ public class CouponDiscountCalculation {
                     cartGoods.setAmount(monthCardDiscount.getDiscountAmount());
                     cartGoods.setCouponCode(monthCardDiscount.getCouponCode());
                     cartGoods.setPic(monthCardDiscount.getCouponLogo());
+                    cartGoods.setQty(1);
                     hasMonCardDiscountVirtualProduct = true;
                 }
             }
@@ -122,6 +123,7 @@ public class CouponDiscountCalculation {
                 virtualProduct.setSpuName(monthCardDiscount.getDiscountDesc());
                 virtualProduct.setCouponCode(monthCardDiscount.getCouponCode());
                 virtualProduct.setPic(monthCardDiscount.getCouponLogo());
+                virtualProduct.setQty(1);
                 virtualProduct.setCouponName(monthCardDiscount.getDiscountDesc());
                 virtualProduct.setAmount(monthCardDiscount.getDiscountAmount());
                 cartGoodsList.add(virtualProduct);