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 7f8e35ea..ef59f927 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 @@ -22,9 +22,9 @@ public interface TbCashierCartMapper extends BaseMapper { @Select("select a.id orderId,b.pending_at pendingAt, sum(b.total_amount) totalAmount, count(b.id) totalCount, sum(b.total_number) totalNumber, a.remark from tb_order_info a " + "JOIN tb_cashier_cart b on a.id=b.order_id " + - "where a.shop_id=#{shopId} and a.`status`='pending' and a.table_id=#{tableId} " + + "where a.shop_id=#{shopId} and a.`status`='pending' and a.table_id=#{tableId} and a.trade_day=#{day}" + "GROUP BY a.id ORDER BY a.id desc ") - List countPending(@Param("shopId") Integer shopId, @Param("tableId") String tableId); + List countPending(@Param("shopId") Integer shopId, @Param("tableId") String tableId, @Param("day") String day); @Select("select a.*, b.spec_snap from tb_cashier_cart as a left join tb_product_sku as b on a.sku_id=b.id where a.shop_id=#{shopId} and a.status='refund';") List selectPending(Integer shopId); 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 76ae3854..5bda00ac 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 @@ -1024,7 +1024,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { public Object getCar(Integer shopId, String tableId) { ArrayList> data = new ArrayList<>(); - List pendingCountVOS = cashierCartMapper.countPending(shopId, tableId); + List pendingCountVOS = cashierCartMapper.countPending(shopId, tableId, DateUtils.getDay()); List tbCashierCarts = cashierCartMapper.selectList(new LambdaQueryWrapper() .eq(TbCashierCart::getShopId, shopId) .eq(TbCashierCart::getTableId, tableId)