From 2fb2667b292392b81c8671c2953e23699108821a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Mon, 18 Nov 2024 11:40:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=B0=E6=A1=8C=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=A0=B9=E6=8D=AEdetail=E8=A1=A8=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/TbCashierCartMapper.java | 3 +++ .../impl/shopimpl/TbShopTableServiceImpl.java | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCashierCartMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCashierCartMapper.java index 82d62dd1..6e8c29da 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCashierCartMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCashierCartMapper.java @@ -48,4 +48,7 @@ public interface TbCashierCartMapper extends BaseMapper { @Update("update tb_cashier_cart set status=#{status}, total_amount=(number+#{changeNum})*sale_price,number=number+#{changeNum},total_number=total_number+#{changeNum} " + "where id=#{id}") int updateNumAmountStatus(Integer id, String status, Integer changeNum); + + @Select("select a.* from tb_cashier_cart as a left join tb_order_detail as b on a.id=b.cart_id where a.shop_id=#{shopId} and a.status=#{state} and a.created_at>#{time} and b.id is not null;") + List selectPlaceCart(Integer shopId, long time, String state); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index fe28005b..7722c9ef 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -263,12 +263,13 @@ public class TbShopTableServiceImpl implements TbShopTableService { List tbShopTableList = shopTablePage.getRecords(); ArrayList> infoList = new ArrayList<>(); - List cartList = tbCashierCartMapper.selectList(new LambdaQueryWrapper() - .eq(TbCashierCart::getShopId, criteria.getShopId()) -// .eq(TbCashierCart::getTableId, date.getQrcode()) - .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()) - .eq(TbCashierCart::getStatus, "create")); +// List cartList = tbCashierCartMapper.selectList(new LambdaQueryWrapper() +// .eq(TbCashierCart::getShopId, criteria.getShopId()) +//// .eq(TbCashierCart::getTableId, date.getQrcode()) +// .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()) +// .eq(TbCashierCart::getStatus, "create")); + List cartList = tbCashierCartMapper.selectPlaceCart(criteria.getShopId(), DateUtil.offsetDay(DateUtil.date(), -1).getTime(), "create"); HashMap countMap = new HashMap<>(); cartList.forEach(item -> { Integer count = countMap.computeIfAbsent(item.getTableId(), k -> 1); @@ -290,8 +291,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { for (TbShopTable date : tbShopTableList) { if (StrUtil.isBlank(date.getQrcode())) { date.setStatus("unbind"); - } else if (countMap.get(date.getQrcode()) != null && countMap.get(date.getQrcode()) < 1 && !TableStateEnum.CLEANING.getState().equals(date.getStatus()) - ) { + } else if (countMap.get(date.getQrcode()) != null && countMap.get(date.getQrcode()) < 1 && !TableStateEnum.CLEANING.getState().equals(date.getStatus())) { date.setStatus("idle"); mpShopTableMapper.update(null, new LambdaUpdateWrapper() .eq(TbShopTable::getQrcode, date.getQrcode())