wangfei 6 gadus atpakaļ
vecāks
revīzija
516dc57ec0
4 mainītis faili ar 109 papildinājumiem un 2 dzēšanām
  1. 92
    0
      log/common.log
  2. 5
    1
      models/course/order.go
  3. 6
    1
      models/goods/orders.go
  4. 6
    0
      service/card/card.go

+ 92
- 0
log/common.log Parādīt failu

@@ -380,3 +380,95 @@ SELECT
380 380
 2018/09/20 20:13:25 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
381 381
 2018/09/20 20:13:25 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
382 382
 2018/09/20 20:13:25 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
383
+2018/09/20 20:14:31 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
384
+2018/09/20 20:14:31 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
385
+2018/09/20 20:14:33 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
386
+2018/09/20 20:14:37 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
387
+2018/09/20 20:14:40 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
388
+2018/09/20 20:14:49 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
389
+2018/09/20 20:15:37 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
390
+2018/09/20 20:15:42 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
391
+2018/09/20 20:15:42 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
392
+2018/09/20 20:15:44 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
393
+2018/09/20 20:15:48 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
394
+2018/09/20 20:15:51 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
395
+2018/09/20 20:16:32 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
396
+2018/09/20 20:16:39 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
397
+2018/09/20 20:16:39 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
398
+2018/09/20 20:16:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
399
+2018/09/20 20:16:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
400
+2018/09/20 20:16:49 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
401
+2018/09/20 20:16:51 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
402
+2018/09/20 20:16:51 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
403
+2018/09/20 20:16:58 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
404
+2018/09/20 20:17:07 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
405
+2018/09/20 20:17:08 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
406
+2018/09/20 20:17:13 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
407
+2018/09/20 20:17:16 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
408
+2018/09/20 20:17:16 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
409
+2018/09/20 20:17:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
410
+2018/09/20 20:17:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
411
+2018/09/20 20:17:26 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
412
+2018/09/20 20:17:29 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
413
+2018/09/20 20:17:31 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
414
+2018/09/20 20:17:40 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
415
+2018/09/20 20:17:40 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
416
+2018/09/20 20:18:58 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
417
+2018/09/20 20:19:03 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
418
+2018/09/20 20:19:04 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
419
+2018/09/20 20:19:05 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
420
+2018/09/20 20:19:09 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
421
+2018/09/20 20:19:10 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
422
+2018/09/20 20:19:59 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
423
+2018/09/20 20:20:02 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
424
+2018/09/20 20:20:06 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
425
+2018/09/20 20:20:08 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
426
+2018/09/20 20:21:25 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
427
+2018/09/20 20:22:32 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
428
+2018/09/20 20:22:37 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
429
+2018/09/20 20:22:37 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
430
+2018/09/20 20:22:39 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
431
+2018/09/20 20:22:45 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
432
+2018/09/20 20:22:46 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
433
+2018/09/20 20:27:24 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
434
+2018/09/20 20:27:28 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
435
+2018/09/20 20:27:33 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
436
+2018/09/20 20:27:33 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
437
+2018/09/20 20:27:35 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
438
+2018/09/20 20:27:38 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
439
+2018/09/20 20:27:39 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
440
+2018/09/20 20:29:00 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
441
+2018/09/20 20:29:08 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
442
+2018/09/20 20:29:08 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
443
+2018/09/20 20:29:11 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
444
+2018/09/20 20:29:14 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
445
+2018/09/20 20:29:15 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
446
+2018/09/20 20:29:51 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
447
+2018/09/20 20:29:54 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
448
+2018/09/20 20:29:54 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
449
+2018/09/20 20:29:58 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
450
+2018/09/20 20:30:01 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
451
+2018/09/20 20:30:02 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
452
+2018/09/20 20:31:00 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
453
+2018/09/20 20:31:04 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
454
+2018/09/20 20:31:04 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
455
+2018/09/20 20:31:06 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
456
+2018/09/20 20:31:09 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
457
+2018/09/20 20:31:11 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
458
+2018/09/20 20:32:04 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
459
+2018/09/20 20:32:04 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
460
+2018/09/20 20:32:08 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
461
+2018/09/20 20:32:11 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
462
+2018/09/20 20:32:13 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
463
+2018/09/20 20:34:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
464
+2018/09/20 20:34:21 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
465
+2018/09/20 20:34:23 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
466
+2018/09/20 20:34:26 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
467
+2018/09/20 20:34:28 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
468
+2018/09/20 20:41:53 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
469
+2018/09/20 20:41:53 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
470
+2018/09/20 20:45:11 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
471
+2018/09/20 20:45:11 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
472
+2018/09/20 20:45:34 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
473
+2018/09/20 20:45:35 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36
474
+2018/09/20 20:45:35 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/69.0.3497.100 safari/537.36

+ 5
- 1
models/course/order.go Parādīt failu

@@ -62,5 +62,9 @@ func (m *CourseDAO) SaveOrdersCoupon(coupon *model.TaCourseOrdersCoupon, order *
62 62
 	if _, err := m.db.Insert(coupon); err != nil {
63 63
 		return err
64 64
 	}
65
-	return nil
65
+
66
+	// 更新优惠券已使用信息
67
+	sql := `update ta_coupon set used_count=used_count+1 where coupon_id='` + coupon.CouponId + `'`
68
+	_, err := m.db.Exec(sql)
69
+	return err
66 70
 }

+ 6
- 1
models/goods/orders.go Parādīt failu

@@ -85,6 +85,11 @@ func (m *GoodsDAO) SaveOrdersCoupon(coupon *model.TaGoodsOrdersCoupon, order *mo
85 85
 		return err
86 86
 	}
87 87
 
88
+	// 更新优惠券已使用信息
89
+	sql := `update ta_coupon set used_count=used_count+1 where coupon_id='` + coupon.CouponId + `'`
90
+	_, err := m.db.Exec(sql)
91
+	return err
92
+
88 93
 	// var couponAmount float64 = 0
89 94
 
90 95
 	// // 补充优惠券表字段
@@ -117,7 +122,7 @@ func (m *GoodsDAO) SaveOrdersCoupon(coupon *model.TaGoodsOrdersCoupon, order *mo
117 122
 	// 	return err
118 123
 	// }
119 124
 
120
-	return nil
125
+	// return nil
121 126
 }
122 127
 
123 128
 func (m *GoodsDAO) getCaseByID(caseID string) (*model.SysCase, error) {

+ 6
- 0
service/card/card.go Parādīt failu

@@ -315,9 +315,11 @@ func (s *CardServ) GiveCardTo(from *model.SysUser, to *model.TaCustomer, card *c
315 315
 	var cardinfo = model.TaCouponCard{
316 316
 		CardId:    card.CardId,
317 317
 		SentCount: card.SentCount + 1,
318
+		UsedCount: card.UsedCount + 1,
318 319
 	}
319 320
 	cols := []string{
320 321
 		"sent_count",
322
+		"used_count",
321 323
 	}
322 324
 	if err := s.dao.UpdateCard(&cardinfo, cols); err != nil {
323 325
 		utils.LogError("回填体验卡信息失败:", err)
@@ -515,8 +517,10 @@ func (s *CardServ) ReceiveCard(id, saleid, serialcode string) error {
515 517
 	}
516 518
 	// 回填体验卡信息
517 519
 	card.SentCount = card.SentCount + 1
520
+	card.UsedCount = card.UsedCount + 1
518 521
 	cols := []string{
519 522
 		"sent_count",
523
+		"used_count",
520 524
 	}
521 525
 	err = s.dao.UpdateCard(card, cols)
522 526
 	if err != nil {
@@ -642,8 +646,10 @@ func (s *CardServ) ChannelReceiveCard(id string) error {
642 646
 	}
643 647
 	// 回填体验卡信息
644 648
 	card.SentCount = card.SentCount + 1
649
+	card.UsedCount = card.UsedCount + 1
645 650
 	cols := []string{
646 651
 		"sent_count",
652
+		"used_count",
647 653
 	}
648 654
 	err = s.dao.UpdateCard(card, cols)
649 655
 	if err != nil {