From 9f2f9bf59a1090eb5985246e0321f85762b8cea9 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Wed, 10 Jul 2024 15:19:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E6=9F=A5=E8=AF=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=20=20scanMemberAwardIn=20=E7=B3=BB=E7=BB=9F=E5=A5=96?= =?UTF-8?q?=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java | 2 +- .../java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java | 2 +- .../cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java index 2b160fc4..938d4ba6 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java @@ -44,7 +44,7 @@ public interface ShopUserMapper extends BaseMapper { " from tb_shop_user_flow tsuf " + " left join tb_shop_user as tsu on tsuf.shop_user_id = tsu.id " + "left join tb_shop_info as tsi on tsi.id = tsu.shop_id " + - "where tsuf.create_time BETWEEN #{param.startTime} and #{param.endTime} and tsuf.biz_code in ('cashMemberIn', 'scanMemberIn') " + + "where tsuf.create_time BETWEEN #{param.startTime} and #{param.endTime} and tsuf.biz_code in ('cashMemberIn', 'scanMemberIn', 'scanMemberAwardIn') " + " and tsu.shop_id = #{param.shopId} " + "order by tsuf.create_time desc " + "") diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java index 5ab665a9..1b7c89a4 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java @@ -25,7 +25,7 @@ public interface TbMShopUserMapper extends BaseMapper { " LEFT JOIN (\n" + " SELECT shop_user_id, SUM(amount) AS total_amount \n" + " FROM tb_shop_user_flow \n" + - " WHERE biz_code IN ('cashMemberIn','scanMemberIn') \n" + + " WHERE biz_code IN ('cashMemberIn','scanMemberIn', 'scanMemberAwardIn') \n" + " GROUP BY shop_user_id\n" + " ) AS flow ON flow.shop_user_id = a.id\n" + "WHERE \n" + 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 a9a76117..51a9334c 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 @@ -29,7 +29,7 @@ public interface TbShopUserFlowMapper extends BaseMapper { " LEFT JOIN (\n" + " SELECT shop_user_id, SUM(amount) AS total_amount \n" + " FROM tb_shop_user_flow \n" + - " WHERE biz_code IN ('cashMemberIn','scanMemberIn') \n" + + " WHERE biz_code IN ('cashMemberIn','scanMemberIn', 'scanMemberAwardIn') \n" + " AND create_time BETWEEN #{startTime} AND #{endTime} \n" + " GROUP BY shop_user_id\n" + " ) AS flow ON flow.shop_user_id = a.id\n" +