sunyu::update::fix bug about monthCard

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

@@ -387,6 +387,21 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, couponCode,
                 cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null);
+
+        //把月卡放到最后
+        if (CollectionUtils.isNotEmpty(cartGoodsList)) {
+            int size = cartGoodsList.size();
+            for(int i=0;i<size;i++) {
+                if(Objects.equals(1,cartGoodsList.get(i).getIsMonthCard())) {
+                    CartGoods montCardGoods = cartGoodsList.get(i);
+                    if(i != size-1) {
+                        cartGoodsList.remove(i);
+                        cartGoodsList.add(montCardGoods);
+                        break;
+                    }
+                }
+            }
+        }
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.ADD_AND_UPDATE, null);
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
@@ -741,6 +756,15 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (CollectionUtils.isNotEmpty(shoppingCartGoodsDto.getProducts())) {
             int size = shoppingCartGoodsDto.getProducts().size();
             for(int i=0;i<size;i++) {
+                //先把月卡放到最后
+                if(Objects.equals(1,cartGoodsList.get(i).getIsMonthCard())) {
+                    CartGoods cartGoods = cartGoodsList.get(i);
+                    if(i != size-1) {
+                        cartGoodsList.remove(i);
+                        cartGoodsList.add(cartGoods);
+                        break;
+                    }
+                }
                 if(shoppingCartGoodsDto.getProducts().get(i).getSkuId().equals(mcCafeTablewareSkuId)) {
                     ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = shoppingCartGoodsDto.getProducts().get(i);
                     cartGoodsDetailDto.setIsTableware(1);