From 56b18ed4060f6449498cae67d6b9097458d57b9b Mon Sep 17 00:00:00 2001
From: duLingLing <dll19920503@qq.com>
Date: Sun, 11 Aug 2019 12:07:02 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E6=97=A5=E8=B4=A6=E5=8D=95KPI=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 .../manage/mappers/financial/FinancialBDPrizeLogMapper.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ef2344442..1e595daa7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.34</version>
+    <version>1.2.35</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
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" +