餐具商品

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

@@ -660,21 +660,6 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
         //恢复套餐商品空键位
 //        checkNewCartGoods(allCartGoodsList,2,map);
-        //如果是餐具商品，则放到最后
-        if (CollectionUtils.isNotEmpty(cartGoodsList)) {
-            int size = cartGoodsList.size();
-            for(int i=0;i<size;i++) {
-                if(cartGoodsList.get(i).getSkuId().equals(mcCafeTablewareSkuId)) {
-                    CartGoods cartGoods = cartGoodsList.get(i);
-                    cartGoods.setIsTableware(true);
-                    if(i != size-1) {
-                        cartGoodsList.remove(i);
-                        cartGoodsList.add(cartGoods);
-                        break;
-                    }
-                }
-            }
-        }
 
         // 重新存储最新购物车
         assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, tableNumber, shoppingCartBaseService);
@@ -708,6 +693,22 @@ public class ShoppingCartMCoffeeServiceImpl {
         //设置均摊信息
         calculationService.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscount, shoppingCartGoodsDto, premiumExchangeActivity, shoppingCartInfoRequestVo);
 
+        //如果是餐具商品，则放到最后
+        if (CollectionUtils.isNotEmpty(shoppingCartGoodsDto.getProducts())) {
+            int size = shoppingCartGoodsDto.getProducts().size();
+            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);
+                    if(i != size-1) {
+                        shoppingCartGoodsDto.getProducts().remove(i);
+                        shoppingCartGoodsDto.getProducts().add(cartGoodsDetailDto);
+                        break;
+                    }
+                }
+            }
+        }
+
         return ResponseUtil.success(shoppingCartGoodsDto);
     }