Browse Source

bug修改

wangfei 6 years ago
parent
commit
b0ba6b1735
5 changed files with 25 additions and 3 deletions
  1. 3
    0
      conf/sms.conf
  2. 2
    1
      controllers/marketing/marketing.go
  3. 15
    0
      log/common.log
  4. 3
    0
      service/card/card.go
  5. 2
    2
      service/marketing/marketing.go

+ 3
- 0
conf/sms.conf View File

14
 
14
 
15
 [orders]
15
 [orders]
16
 message = {"code": "0116", "tel": "%s", "params": [%s]}
16
 message = {"code": "0116", "tel": "%s", "params": [%s]}
17
+
18
+[cardget]
19
+message = {"code": "0117", "tel": "%s", "params": [%s]}

+ 2
- 1
controllers/marketing/marketing.go View File

40
 	// 获取值
40
 	// 获取值
41
 	activityName := c.GetString("activityName")
41
 	activityName := c.GetString("activityName")
42
 	activityType := c.GetString("activityType")
42
 	activityType := c.GetString("activityType")
43
+	activeType := c.GetString("activeType")
43
 	resourceDesc := c.GetString("resourceDesc") // 活动描述
44
 	resourceDesc := c.GetString("resourceDesc") // 活动描述
44
 
45
 
45
 	// 赋值
46
 	// 赋值
46
 	marketing.ActivityName = activityName
47
 	marketing.ActivityName = activityName
47
 	marketing.ActivityType = activityType
48
 	marketing.ActivityType = activityType
48
 
49
 
49
-	newInfo, _, err := c.serv.SaveMarketing(marketing, resourceDesc)
50
+	newInfo, _, err := c.serv.SaveMarketing(marketing, activeType, resourceDesc)
50
 	if err != nil {
51
 	if err != nil {
51
 		c.ResponseError(err)
52
 		c.ResponseError(err)
52
 	}
53
 	}

+ 15
- 0
log/common.log View File

424
 2018/09/26 14:16:18 [E] 用户没有设置默认案场
424
 2018/09/26 14:16:18 [E] 用户没有设置默认案场
425
 2018/09/26 14:16:36 [E] 用户没有设置默认案场
425
 2018/09/26 14:16:36 [E] 用户没有设置默认案场
426
 2018/09/26 14:16:36 [E] 用户没有设置默认案场
426
 2018/09/26 14:16:36 [E] 用户没有设置默认案场
427
+2018/09/26 14:21:38 [E] 用户没有设置默认案场
428
+2018/09/26 14:21:50 [E] 用户没有设置默认案场
429
+2018/09/26 14:27:34 [E] 用户没有设置默认案场
430
+2018/09/26 14:27:44 [E] 用户没有设置默认案场
431
+2018/09/26 14:27:48 [E] 用户没有设置默认案场
432
+2018/09/26 14:28:35 [E] 用户没有设置默认案场
433
+2018/09/26 14:29:04 [E] 用户没有设置默认案场
434
+2018/09/26 14:29:05 [E] 用户没有设置默认案场
435
+2018/09/26 14:30:22 [E] 用户没有设置默认案场
436
+2018/09/26 14:30:28 [E] 用户没有设置默认案场
437
+2018/09/26 14:30:35 [E] 用户没有设置默认案场
438
+2018/09/26 14:31:11 [E] 用户没有设置默认案场
439
+2018/09/26 14:31:11 [E] 用户没有设置默认案场
440
+2018/09/26 14:31:56 [E] 用户没有设置默认案场
441
+2018/09/26 14:31:56 [E] 用户没有设置默认案场

+ 3
- 0
service/card/card.go View File

598
 			utils.LogError("生成我的课程二维码失败:" + err.Error())
598
 			utils.LogError("生成我的课程二维码失败:" + err.Error())
599
 			return errors.New("生成我的课程二维码失败")
599
 			return errors.New("生成我的课程二维码失败")
600
 		}
600
 		}
601
+
602
+		utils.SendSMS("cardget", customer.Phone, course.CourseName)
601
 	}
603
 	}
604
+
602
 	return nil
605
 	return nil
603
 }
606
 }
604
 
607
 

+ 2
- 2
service/marketing/marketing.go View File

59
 /**
59
 /**
60
 * resource_desc 活动描述
60
 * resource_desc 活动描述
61
  */
61
  */
62
-func (s *MarketingServ) SaveMarketing(activity model.SysActivity, resourceDesc string) (*model.SysActivity, *model.SysActivityAction, error) {
62
+func (s *MarketingServ) SaveMarketing(activity model.SysActivity, activeType, resourceDesc string) (*model.SysActivity, *model.SysActivityAction, error) {
63
 
63
 
64
 	var newInfo *model.SysActivity
64
 	var newInfo *model.SysActivity
65
 	var newWoke *model.SysActivityAction
65
 	var newWoke *model.SysActivityAction
79
 
79
 
80
 	woke := model.SysActivityAction{}
80
 	woke := model.SysActivityAction{}
81
 	woke.ActivityId = newInfo.ActivityId
81
 	woke.ActivityId = newInfo.ActivityId
82
-	woke.ActiveType = newInfo.ActivityType
82
+	woke.ActiveType = activeType
83
 	woke.ResourceDesc = resourceDesc
83
 	woke.ResourceDesc = resourceDesc
84
 	woke.ResourceType = "占位符"
84
 	woke.ResourceType = "占位符"
85
 
85