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

充值查询增加 scanMemberAwardIn 系统奖励

Browse Source
This commit is contained in:
GYJ
2024-07-10 15:19:52 +08:00
parent df6a41430e
commit 9f2f9bf59a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java
View File

@@ -44,7 +44,7 @@ public interface ShopUserMapper extends BaseMapper<TbShopUser> {
" from tb_shop_user_flow tsuf " + " from tb_shop_user_flow tsuf " +
" left join tb_shop_user as tsu on tsuf.shop_user_id = tsu.id " + " 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 " + "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} " + " and tsu.shop_id = #{param.shopId} " +
"order by tsuf.create_time desc " + "order by tsuf.create_time desc " +
"</script>") "</script>")

2
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
View File

@@ -25,7 +25,7 @@ public interface TbMShopUserMapper extends BaseMapper<TbMShopUser> {
" LEFT JOIN (\n" + " LEFT JOIN (\n" +
" SELECT shop_user_id, SUM(amount) AS total_amount \n" + " SELECT shop_user_id, SUM(amount) AS total_amount \n" +
" FROM tb_shop_user_flow \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" + " GROUP BY shop_user_id\n" +
" ) AS flow ON flow.shop_user_id = a.id\n" + " ) AS flow ON flow.shop_user_id = a.id\n" +
"WHERE \n" + "WHERE \n" +

2
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java
View File

@@ -29,7 +29,7 @@ public interface TbShopUserFlowMapper extends BaseMapper<TbShopUserFlow> {
" LEFT JOIN (\n" + " LEFT JOIN (\n" +
" SELECT shop_user_id, SUM(amount) AS total_amount \n" + " SELECT shop_user_id, SUM(amount) AS total_amount \n" +
" FROM tb_shop_user_flow \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" + " AND create_time BETWEEN #{startTime} AND #{endTime} \n" +
" GROUP BY shop_user_id\n" + " GROUP BY shop_user_id\n" +
" ) AS flow ON flow.shop_user_id = a.id\n" + " ) AS flow ON flow.shop_user_id = a.id\n" +