czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.代客下单 只查询当天挂起订单

Browse Source
This commit is contained in:
SongZhang
2024-08-26 09:21:50 +08:00
parent 29ccf35e5f
commit d272efa45f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCashierCartMapper.java
View File

@@ -22,9 +22,9 @@ public interface TbCashierCartMapper extends BaseMapper<TbCashierCart> {
@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 " + @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 " + "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 ") "GROUP BY a.id ORDER BY a.id desc ")
List<PendingCountVO> countPending(@Param("shopId") Integer shopId, @Param("tableId") String tableId); List<PendingCountVO> 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';") @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<TbCashierCartVO> selectPending(Integer shopId); List<TbCashierCartVO> selectPending(Integer shopId);

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -1024,7 +1024,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
public Object getCar(Integer shopId, String tableId) { public Object getCar(Integer shopId, String tableId) {
ArrayList<Map<String, Object>> data = new ArrayList<>(); ArrayList<Map<String, Object>> data = new ArrayList<>();
List<PendingCountVO> pendingCountVOS = cashierCartMapper.countPending(shopId, tableId); List<PendingCountVO> pendingCountVOS = cashierCartMapper.countPending(shopId, tableId, DateUtils.getDay());
List<TbCashierCart> tbCashierCarts = cashierCartMapper.selectList(new LambdaQueryWrapper<TbCashierCart>() List<TbCashierCart> tbCashierCarts = cashierCartMapper.selectList(new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, shopId) .eq(TbCashierCart::getShopId, shopId)
.eq(TbCashierCart::getTableId, tableId) .eq(TbCashierCart::getTableId, tableId)