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

Merge branch 'refs/heads/dev' into test

This commit is contained in:
GYJ 2024-10-31 14:43:34 +08:00
parent f8797b0e79 c6aba2caa9
commit 0186055934
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
View File

@ -207,7 +207,7 @@ public interface TbOrderDetailRepository extends JpaRepository<TbOrderDetail, In
"LEFT JOIN TbShopCategory cate ON cate.id = pro.categoryId " + "LEFT JOIN TbShopCategory cate ON cate.id = pro.categoryId " +
"WHERE info.shopId = :shopId " + "WHERE info.shopId = :shopId " +
"AND info.createTime > :startTime AND info.createTime < :endTime " + "AND info.createTime > :startTime AND info.createTime < :endTime " +
"AND (info.status = 'closed' OR info.status = 'refund') " + "AND (orders.status = 'closed' OR orders.orderType = 'return') " +
"GROUP BY info.productId, info.productSkuId, orders.tableId " + "GROUP BY info.productId, info.productSkuId, orders.tableId " +
"ORDER BY salesNum DESC") "ORDER BY salesNum DESC")
List<TbOrderSalesCountByTable> queryTbOrderSalesCountByTable(@Param("shopId") Integer shopId, @Param("startTime") Date startTime, @Param("endTime") Date endTime); List<TbOrderSalesCountByTable> queryTbOrderSalesCountByTable(@Param("shopId") Integer shopId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);