Merge branch 'ww' into test

2024-09-29 10:30:23 +08:00
parent 66c28248b7 bfb9f82659
commit 45907f107d
2 changed files with 2 additions and 2 deletions
--- 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<TbShopUserFlow> {
            "    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 " +