Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa

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

@@ -726,17 +726,6 @@ public class ShoppingCartMCoffeeServiceImpl {
                 int size = cartGoodsList.size();
                 for(int i=0;i<size;i++) {
                     //先把月卡放到最后
-                    if(null != cartGoodsList.get(i) && Objects.equals(1,cartGoodsList.get(i).getIsB3S1Coupon())) {
-                        CartGoods cartGoods = cartGoodsList.get(i);
-                        if(i != size-1) {
-                            cartGoodsList.remove(i);
-                            cartGoodsList.add(cartGoods);
-                            break;
-                        }
-                    }
-                }
-                for(int i=0;i<size;i++) {
-                    //先把月卡放到最后
                     if(null != cartGoodsList.get(i) && Objects.equals(1,cartGoodsList.get(i).getIsMonthCard())) {
                         CartGoods cartGoods = cartGoodsList.get(i);
                         if(i != size-1) {
@@ -1027,17 +1016,6 @@ public class ShoppingCartMCoffeeServiceImpl {
                 int size = cartGoodsList.size();
                 for(int i=0;i<size;i++) {
                     //先把月卡放到最后
-                    if(null != cartGoodsList.get(i) && Objects.equals(1,cartGoodsList.get(i).getIsB3S1Coupon())) {
-                        CartGoods cartGoods = cartGoodsList.get(i);
-                        if(i != size-1) {
-                            cartGoodsList.remove(i);
-                            cartGoodsList.add(cartGoods);
-                            break;
-                        }
-                    }
-                }
-                for(int i=0;i<size;i++) {
-                    //先把月卡放到最后
                     if(null != cartGoodsList.get(i) && Objects.equals(1,cartGoodsList.get(i).getIsMonthCard())) {
                         CartGoods cartGoods = cartGoodsList.get(i);
                         if(i != size-1) {
@@ -1375,6 +1353,8 @@ public class ShoppingCartMCoffeeServiceImpl {
                         break;
                     }
                 }
+            }
+            for(int i=0;i<size;i++) {
                 if(shoppingCartGoodsDto.getProducts().get(i).getSkuId().equals(mcCafeTablewareSkuId)) {
                     ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = shoppingCartGoodsDto.getProducts().get(i);
                     cartGoodsDetailDto.setIsTableware(1);