From bfb9f826597f683eb8ca2d6fd58fe77afcbc1b70 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sun, 29 Sep 2024 10:29:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E4=B8=9A=E6=9D=BF=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java | 2 +- .../cn/ysk/cashier/repository/shop/TbShopTableRepository.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java index 6a818edd..d301887e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java @@ -30,7 +30,7 @@ public interface TbShopUserFlowMapper extends BaseMapper { " LEFT JOIN ( " + " SELECT shop_user_id, SUM(amount) AS total_amount " + " FROM tb_shop_user_flow " + - " WHERE biz_code IN ('cashMemberIn','scanMemberIn', 'scanMemberAwardIn') " + + " WHERE biz_code IN ('cashMemberIn', 'inMoneyIn', 'scanMemberIn') " + " AND create_time BETWEEN #{startTime} AND #{endTime} " + " GROUP BY shop_user_id " + " ) AS flow ON flow.shop_user_id = a.id " + diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopTableRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopTableRepository.java index 6a29053b..3316ae98 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopTableRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopTableRepository.java @@ -17,7 +17,7 @@ import java.util.List; **/ public interface TbShopTableRepository extends JpaRepository, JpaSpecificationExecutor { - @Query + @Query("select count(1) from TbShopTable table where table.shopId = :shopId") int countAllByShopId(@Param("shopId")Integer shopId); @Query("select table from TbShopTable table where table.qrcode = :qrcode")