Browse Source

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

胡轶钦 6 years ago
parent
commit
7e49b9e17a
2 changed files with 4 additions and 4 deletions
  1. 1
    1
      controllers/statistics/cardcoupon.go
  2. 3
    3
      models/statistics/cardcoupon.go

+ 1
- 1
controllers/statistics/cardcoupon.go View File

164
 		case "event":
164
 		case "event":
165
 			receivetype = "系统"
165
 			receivetype = "系统"
166
 			break
166
 			break
167
-		case "case":
167
+		case "sales":
168
 			receivetype = "案场"
168
 			receivetype = "案场"
169
 			break
169
 			break
170
 		case "channel":
170
 		case "channel":

+ 3
- 3
models/statistics/cardcoupon.go View File

225
 							a.start_date,
225
 							a.start_date,
226
 							a.end_date,
226
 							a.end_date,
227
 							a.receive_date,
227
 							a.receive_date,
228
-							a.receive_date as used_date,
229
-							'used' as verify_status
228
+							a.verify_date as used_date,
229
+							a.verify_status
230
 						FROM
230
 						FROM
231
 							ta_customer_card a
231
 							ta_customer_card a
232
 						INNER JOIN ta_coupon_card_target b ON b.card_id = a.card_id
232
 						INNER JOIN ta_coupon_card_target b ON b.card_id = a.card_id
325
 							a.start_date,
325
 							a.start_date,
326
 							a.end_date,
326
 							a.end_date,
327
 							a.receive_date,
327
 							a.receive_date,
328
-							a.receive_date as used_date,
328
+							a.verify_date as used_date,
329
 							a.verify_status
329
 							a.verify_status
330
 						FROM
330
 						FROM
331
 							ta_customer_card a
331
 							ta_customer_card a