diff --git a/pom.xml b/pom.xml index 008c8bb96..dc29ffe5a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.1.2 - 1.1.5 + 1.1.6 diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java index 317c66c07..9f36ec6f8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java @@ -55,7 +55,7 @@ public interface FinancialBDPrizeLogMapper { "\tsc.org_id = 1 \n" + "\tAND o.date >= #{start_date} \n" + "\tAND o.date < #{end_date} \n" + - "\tAND d.start_date <= o.date AND d.is_valid = 1 AND ( d.end_date IS NULL OR d.end_date > o.date \n" + + "\tAND d.start_date <= o.date AND ( d.end_date IS NULL OR d.end_date > o.date \n" + "\t) \n" + "\tAND c.get_prize = 1 \n" + "\tAND c.manager_id = #{manager_id}") @@ -103,7 +103,7 @@ public interface FinancialBDPrizeLogMapper { "\tsc.org_id = 1 \n" + "\tAND o.date >= #{start_date} \n" + "\tAND o.date < #{end_date} \n" + - "\tAND d.start_date <= o.date AND d.is_valid = 1 AND ( d.end_date IS NULL OR d.end_date > o.date \n" + + "\tAND d.start_date <= o.date AND ( d.end_date IS NULL OR d.end_date > o.date \n" + "\t) \n" + "\tAND c.bd_group IS NOT NULL \n" + "GROUP BY\n" + @@ -128,7 +128,7 @@ public interface FinancialBDPrizeLogMapper { "\tsc.org_id = 1 \n" + "\tAND o.date >= #{start_date} \n" + "\tAND o.date < #{end_date} \n" + - "\tAND d.start_date <= o.date AND d.is_valid = 1 AND ( d.end_date IS NULL OR d.end_date > o.date \n" + + "\tAND d.start_date <= o.date AND ( d.end_date IS NULL OR d.end_date > o.date \n" + "\t) \n" + "\tAND c.bd_group IS NOT NULL \n" + "GROUP BY\n" + @@ -148,7 +148,7 @@ public interface FinancialBDPrizeLogMapper { "\tsc.org_id = 1 \n" + "\tAND o.date >= #{month_start_date} \n" + "\tAND o.date < #{end_date} \n" + - "\tAND d.start_date <= o.date AND d.is_valid = 1 AND ( d.end_date IS NULL OR d.end_date > o.date \n" + + "\tAND d.start_date <= o.date AND ( d.end_date IS NULL OR d.end_date > o.date \n" + "\t) \n" + "\tAND c.bd_group IS NOT NULL \n" + "GROUP BY\n" + 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 3f0bcb658..1934242b7 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 @@ -555,11 +555,11 @@ fbc.bd_type, sum( a.proportion ) clients_month FROM - sys_client_bd a - INNER JOIN ( + ( SELECT bd_id, - max( create_time ) create_time + max( create_time ) create_time, + proportion FROM sys_client_bd WHERE @@ -581,12 +581,9 @@ GROUP BY bd_id, client_id - ) b ON a.bd_id = b.bd_id - AND a.create_time = b.create_time + ) a INNER JOIN financial_bd_config c ON a.bd_id = c.manager_id INNER JOIN financial_bd_config fbc ON fbc.manager_id = c.bd_group - WHERE - a.is_valid = 1 GROUP BY fbc.bd_group ORDER BY @@ -599,11 +596,11 @@ fbc.bd_type, sum( a.proportion ) clients_yesterday FROM - sys_client_bd a - INNER JOIN ( + ( SELECT bd_id, - max( create_time ) create_time + max( create_time ) create_time, + proportion FROM sys_client_bd WHERE @@ -625,12 +622,9 @@ GROUP BY bd_id, client_id - ) b ON a.bd_id = b.bd_id - AND a.create_time = b.create_time + ) a INNER JOIN financial_bd_config c ON a.bd_id = c.manager_id INNER JOIN financial_bd_config fbc ON fbc.manager_id = c.bd_group - WHERE - a.is_valid = 1 GROUP BY fbc.bd_group ORDER BY