From f9bde28cb7536d335a2a62d36a720152c98d777b Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Thu, 12 Jul 2018 11:47:52 +0800
Subject: [PATCH] update sql

---
 .../payment/manage/mappers/act/ActChairtyMapper.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml
index b97c44145..edc40b062 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml
@@ -2,12 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="au.com.royalpay.payment.manage.mappers.act.ActChairtyMapper">
     <select id="chairtyClientNum" resultType="com.alibaba.fastjson.JSONObject">
-select DISTINCT (count(order_id))  as count_ordernum ,client_moniker,active_time,ifnull(sum(pmt_transactions.transaction_amount),0) as sum_ordernum
-from act_charity
-left  JOIN pmt_transactions on act_charity.client_id = pmt_transactions.client_id
-and pmt_transactions.transaction_type='Credit'  and pmt_transactions.transaction_time>=act_charity.active_time
-and pmt_transactions.refund_id is null and pmt_transactions.channel != 'Settlement'
-GROUP BY act_charity.client_id order by sum_ordernum desc
+        select DISTINCT (count(order_id))  as count_ordernum ,client_moniker,active_time,ifnull(sum(pmt_transactions.transaction_amount),0) as sum_ordernum
+        from  act_charity
+        left JOIN  pmt_transactions on act_charity.client_id = pmt_transactions.client_id
+        and pmt_transactions.transaction_type='Credit'  and pmt_transactions.transaction_time>=act_charity.active_time
+        and  pmt_transactions.transaction_time&lt;'2018-09-01'
+        and pmt_transactions.channel != 'Settlement'
+        GROUP BY act_charity.client_id order by sum_ordernum desc
     </select>
 
     <select id="getChairtyWeekstartAnalysis" resultType="com.alibaba.fastjson.JSONObject">