sunyu::update::fix bug about addCart

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

@@ -432,28 +432,28 @@ public class ShoppingCartMCoffeeServiceImpl {
             cartGoodsList = temList;
             if (CollectionUtils.isNotEmpty(cartGoodsList)) {
                 int size = cartGoodsList.size();
-                Boolean hasTableWareSku = false;
+                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;
+                        }
+                    }
+                }
                 for(int i=0;i<size;i++) {
                     //如果是餐具商品，则放到最后
                     if(cartGoodsList.get(i).getSkuId().equals(mcCafeTablewareSkuId)) {
                         CartGoods cartGoods = cartGoodsList.get(i);
                         cartGoods.setIsTableware(true);
-                        hasTableWareSku = true;
                         if(i != size-1) {
                             cartGoodsList.remove(i);
                             cartGoodsList.add(cartGoods);
                             break;
                         }
                     }
-                    //如果有餐具,月享卡放倒数第二; 没有餐具,月享卡放最后
-                    if(Objects.equals(1,cartGoodsList.get(i).getIsMonthCard())) {
-                       CartGoods cartGoods = cartGoodsList.get(i);
-                       if (hasTableWareSku && size > 1){
-                           cartGoodsList.add(size-2,cartGoods);
-                       }else{
-                           cartGoodsList.add(cartGoods);
-                       }
-                    }
                 }
             }
             // 重新存储最新购物车
@@ -1572,26 +1572,28 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         if (CollectionUtils.isNotEmpty(allCartGoodsList)) {
             int size = allCartGoodsList.size();
-            Boolean hasTableWareSku = false;
+
             for(int i=0;i<size;i++) {
-                //如果是餐具商品，则放到最后
-                if(allCartGoodsList.get(i).getSkuId().equals(mcCafeTablewareSkuId)) {
+                //如果是先把月享卡放到最后
+                if(Objects.equals(1,allCartGoodsList.get(i).getIsMonthCard())) {
                     CartGoods cartGoods = allCartGoodsList.get(i);
-                    cartGoods.setIsTableware(true);
-                    hasTableWareSku = true;
                     if(i != size-1) {
                         allCartGoodsList.remove(i);
                         allCartGoodsList.add(cartGoods);
                         break;
                     }
                 }
-                //如果有餐具,月享卡放倒数第二; 没有餐具,月享卡放最后
-                if(Objects.equals(1,allCartGoodsList.get(i).getIsMonthCard())) {
+            }
+
+            for(int i=0;i<size;i++) {
+                //如果是餐具商品，则放到最后
+                if(allCartGoodsList.get(i).getSkuId().equals(mcCafeTablewareSkuId)) {
                     CartGoods cartGoods = allCartGoodsList.get(i);
-                    if (hasTableWareSku && size > 1){
-                        allCartGoodsList.add(size-2,cartGoods);
-                    }else{
+                    cartGoods.setIsTableware(true);
+                    if(i != size-1) {
+                        allCartGoodsList.remove(i);
                         allCartGoodsList.add(cartGoods);
+                        break;
                     }
                 }
             }