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

controllers/statistics/cardcoupon.go

@@ -164,7 +164,7 @@ func (c *StatisticsController) CardCouponUsedStatisticsExcel() {
 		case "event":
 			receivetype = "系统"
 			break
-		case "case":
+		case "sales":
 			receivetype = "案场"
 			break
 		case "channel":

models/statistics/cardcoupon.go

@@ -225,8 +225,8 @@ func (m *StatisticsDAO) CardCouponUsedStatistics(caseids, tel, name, receivetype
 							a.start_date,
 							a.end_date,
 							a.receive_date,
-							a.receive_date as used_date,
-							'used' as verify_status
+							a.verify_date as used_date,
+							a.verify_status
 						FROM
 							ta_customer_card a
 						INNER JOIN ta_coupon_card_target b ON b.card_id = a.card_id
@@ -325,7 +325,7 @@ func (m *StatisticsDAO) CardCouponUsedCountStatistics(caseids, tel, name, receiv
 							a.start_date,
 							a.end_date,
 							a.receive_date,
-							a.receive_date as used_date,
+							a.verify_date as used_date,
 							a.verify_status
 						FROM
 							ta_customer_card a