Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

models/statistics/cardcoupon.go

@@ -5,6 +5,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/astaxie/beego"
 )
 
 // CardCouponStatistics 商品统计信息
@@ -293,7 +295,7 @@ func (m *StatisticsDAO) CardCouponUsedStatistics(caseids, tel, name, receivetype
 		sql = sql + ` and tab.receiving_type = '` + receivetype + `'`
 	}
 	if status != "" {
-		sql = sql + ` and tab.verify_status = '` + receivetype + `'`
+		sql = sql + ` and tab.verify_status = '` + status + `'`
 	}
 	if begindate != "" {
 		sql = sql + ` and DATE_FORMAT(tab.receive_date, '%Y-%m-%d') >= '` + begindate + `'`
@@ -393,7 +395,7 @@ func (m *StatisticsDAO) CardCouponUsedCountStatistics(caseids, tel, name, receiv
 		sql = sql + ` and tab.receiving_type = '` + receivetype + `'`
 	}
 	if status != "" {
-		sql = sql + ` and tab.verify_status = '` + receivetype + `'`
+		sql = sql + ` and tab.verify_status = '` + status + `'`
 	}
 	if begindate != "" {
 		sql = sql + ` and DATE_FORMAT(tab.receive_date, '%Y-%m-%d') >= '` + begindate + `'`
@@ -401,6 +403,7 @@ func (m *StatisticsDAO) CardCouponUsedCountStatistics(caseids, tel, name, receiv
 	if enddate != "" {
 		sql = sql + ` and DATE_FORMAT(tab.receive_date, '%Y-%m-%d') <= '` + enddate + `'`
 	}
+	beego.Error(sql)
 	err := m.db.Sql(sql).Find(&cardCoupons)
 	return cardCoupons, err
 }