diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java index d6440cf..c8e459c 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java @@ -146,9 +146,8 @@ public class ProductService { TbOrderInfo order = getCurrentOrder(shopEatTypeInfoDTO, code, shopInfo.getId()); if (tbShopTable != null) { tbShopTable.setOrderId(order == null ? null : order.getId()); - TbCashierCart seatCartInfo = getSeatCartInfo(shopId, tbShopTable.getQrcode(), Integer.valueOf(userId), shopEatTypeInfoDTO); + TbCashierCart seatCartInfo = getSeatCartInfo(tbShopTable.getShopId(), tbShopTable.getQrcode(), Integer.valueOf(userId), shopEatTypeInfoDTO); tbShopTable.setChoseCount(seatCartInfo != null && (seatCartInfo.getNumber() != null)); - } concurrentMap.put("shopTableInfo", tbShopTable == null ? "" : tbShopTable);