diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java index 0643281..ea69d28 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -789,6 +789,15 @@ public class CartService { // 所有订单信息 List cashierCartList = mpCashierCartMapper.selectList(queryWrapper); + + if (cashierCartList.isEmpty()) { + responseData.put("status", "fail"); + responseData.put("msg", "购物车为空"); + responseData.put("data", new ArrayList<>()); + PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(responseData.toString(), tableCartKey, jsonObject.getString("userId"), true); + return; + } + // 就餐人数 ArrayList cashierIds = new ArrayList<>(); @@ -823,13 +832,6 @@ public class CartService { return; } - if (cashierIds.isEmpty() || (cashierIds.size() == 1 && !shopEatTypeInfoDTO.isTakeout())) { - responseData.put("status", "fail"); - responseData.put("msg", "购物车为空"); - responseData.put("data", new ArrayList<>()); - PushToAppChannelHandlerAdapter.getInstance().AppSendInfo(responseData.toString(), tableCartKey, jsonObject.getString("userId"), true); - return; - } TbShopUser tbShopUser = shopUserMapper.selectByUserIdAndShopId(userId, shopId); boolean isVip = tbShopUser != null && tbShopUser.getIsVip().equals((byte) 1);