diff --git a/pom.xml b/pom.xml index 5173364fa..d42d12543 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.4.8 + 1.4.9 UTF-8 1.8.0 diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml index 3506f47a6..1735082c6 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml @@ -1116,10 +1116,13 @@ statistics_customer_order so inner JOIN sys_clients c ON so.client_id = c.client_id AND c.is_valid = 1 - + AND c.royalpayindustry like #{industry} + + AND (c.royalpayindustry =1 or c.royalpayindustry like '100%') + and so.date >= #{from} and so.date < #{to} and so.client_id!=0 @@ -1144,10 +1147,13 @@ statistics_customer_order so inner JOIN sys_clients c ON so.client_id = c.client_id AND c.is_valid = 1 - + AND c.royalpayindustry like #{industry} + + AND (c.royalpayindustry =1 or c.royalpayindustry like '100%') + and so.date= #{transDate} and so.client_id!=0 diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml index 5b9e0db6a..6812d0dbb 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml @@ -89,10 +89,13 @@ AND c.business_structure=#{business_structure} - + AND c.royalpayindustry like #{industry} + + AND (c.royalpayindustry =1 or c.royalpayindustry like '100%') + AND c.create_time >= #{create_start_time}