diff --git a/pom.xml b/pom.xml index ef2344442..1e595daa7 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.34 + 1.2.35 UTF-8 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 88f6c66d6..8e0dd60cd 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 @@ -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.end_date IS NULL OR d.end_date > o.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" + "\t) \n" + "\tAND c.bd_group IS NOT NULL \n" + "\tAND fbc.bd_type in (1, 2, 6, 7) \n" + @@ -149,7 +149,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.end_date IS NULL OR d.end_date > o.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" + "\t) \n" + "\tAND c.bd_group IS NOT NULL \n" + "\tAND fbc.bd_type in (1, 2, 6, 7) \n" +