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

Merge branch 'ww' into test

Browse Source
This commit is contained in:
wangw
2024-10-08 18:02:02 +08:00
parent 548c3a1940 772c827118
commit 9f9355af39
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
View File

@@ -28,7 +28,8 @@ public interface ProductStockCountRepository extends JpaRepository<TbProductStoc
" INNER JOIN tb_product pro ON d.product_id = pro.id " +
" AND pro.shop_id = :shopId " +
" AND (:categoryId IS NULL OR pro.category_id = :categoryId) " +
" AND (:productName IS NULL OR d.product_name LIKE %:productName%) " +
" AND (:productName IS NULL OR pro.name LIKE %:productName%) " +
" AND (:type IS NULL OR pro.type_enum = :type) " +
" WHERE " +
" d.shop_id = :shopId " +
"AND d.created_at > :startTime " +
@@ -42,7 +43,7 @@ public interface ProductStockCountRepository extends JpaRepository<TbProductStoc
" and pro.shop_id = :shopId " +
" and (:categoryId IS NULL OR pro.category_id = :categoryId) " +
" AND (:productName IS NULL OR pro.name LIKE %:productName%) " +
" AND (:type IS NULL OR pro.type = type) " +
" AND (:type IS NULL OR pro.type_enum = :type) " +
" WHERE " +
" d.shop_id = :shopId " +
" AND d.created_at > :startTime " +
@@ -68,7 +69,7 @@ public interface ProductStockCountRepository extends JpaRepository<TbProductStoc
" AND pro.shopId = :shopId " +
" AND ( :categoryId IS NULL OR pro.categoryId = :categoryId ) " +
" AND ( :productName IS NULL OR pro.name LIKE %:productName% ) " +
" AND ( :type IS NULL OR pro.type = :type ) " +
" AND ( :type IS NULL OR pro.typeEnum = :type ) " +
"WHERE " +
" detail.shopId = :shopId " +
" AND detail.createdAt > :startTime " +