Sfoglia il codice sorgente

关闭前端关注调试

xingzai 3 anni fa
parent
commit
31fa353822
4 ha cambiato i file con 29 aggiunte e 35 eliminazioni
  1. 4 6
      controllers/activity.go
  2. 1 8
      controllers/user.go
  3. 7 2
      models/activity_signup.go
  4. 17 19
      services/task.go

+ 4 - 6
controllers/activity.go

@@ -985,7 +985,9 @@ func (this *ActivityCoAntroller) SignupAdd() {
 	}
 	if signupType == 1 && user.IsMsgOutboundMobile == 0 {
 		resp.GoOutboundMobile = true
-		//go models.ModifyWxUserIsMsgOutboundMobile(user.UserId)
+		if user.Mobile != "" || user.OutboundMobile != "" {
+			go models.ModifyWxUserIsMsgOutboundMobile(user.UserId)
+		}
 	}
 	if user.OutboundMobile == "" {
 		resp.Mobile = user.Mobile
@@ -1010,13 +1012,9 @@ func (this *ActivityCoAntroller) SignupAdd() {
 		br.ErrMsg = "获取日程数量信息失败,Err:" + err.Error()
 		return
 	}
-	//if total <= 1 {
-	//	resp.GoFollow = true
-	//}
-	if activityId%2 == 0 {
+	if total <= 1 {
 		resp.GoFollow = true
 	}
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"

+ 1 - 8
controllers/user.go

@@ -1125,14 +1125,7 @@ func (this *UserController) AddOutboundMobile() {
 			items.DoFailType = 0
 			items.OutboundMobile = req.OutboundMobile
 			items.CountryCode = req.OutboundCountryCode
-			_, errSignup := models.AddActivitySignup(items)
-			if errSignup != nil {
-				br.Msg = "操作失败"
-				br.ErrMsg = "操作失败,Err:" + errSignup.Error()
-				return
-			}
-			err = models.AddOutboundMobile(item, uid)
-
+			_, err = models.AddActivitySignupFromEmail(items)
 		} else {
 			total, err := models.GetActivityCountByIdWithUid(item.ActivityId, uid)
 			if total == 0 {

+ 7 - 2
models/activity_signup.go

@@ -125,7 +125,7 @@ func AddActivitySignup(item *CygxActivitySignup) (lastId int64, err error) {
 	return
 }
 
-//添加报名信息
+//仅绑定邮箱的用户修改报名后,添加报名信息
 func AddActivitySignupFromEmail(item *CygxActivitySignup) (lastId int64, err error) {
 	o := orm.NewOrm()
 	o.Begin()
@@ -139,7 +139,12 @@ func AddActivitySignupFromEmail(item *CygxActivitySignup) (lastId int64, err err
 	}()
 	var count int
 	var countMySchedule int
-	sql := `SELECT COUNT(1) AS count FROM cygx_my_schedule WHERE user_id=? AND activity_id=? `
+	sql := `UPDATE wx_user SET outbound_mobile=? ,outbound_country_code = ?  WHERE user_id=? `
+	_, err = o.Raw(sql, item.OutboundMobile, item.CountryCode, item.UserId).Exec()
+	if err != nil {
+		return
+	}
+	sql = `SELECT COUNT(1) AS count FROM cygx_my_schedule WHERE user_id=? AND activity_id=? `
 	err = o.Raw(sql, item.UserId, item.ActivityId).QueryRow(&countMySchedule)
 	if err != nil {
 		return

+ 17 - 19
services/task.go

@@ -35,28 +35,26 @@ func Task() {
 
 	//UpdateActivitySattus()
 	//修改任务状态
-	//updateActivitySattus := task.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
-	//task.AddTask("updateActivitySattus", updateActivitySattus)
-	////更新深 和新的标签
-	//updateIndustrialManagementLabel := task.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
-	//task.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
-	////更新报告的搜索栏内容
-	////UpdateIndustrialManagementSubjectNnames()
-	////会议提醒模板消息推送
-	//sendActivityBeginMsg := task.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
-	//task.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
-	//sendActivityBeginMsgMeeting := task.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
-	//task.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
-	////预约外呼名单,会前1小时自动发送邮件给专家组
-	//sendEmailFileToExpert := task.NewTask("sendEmailFileToExpert", "0 */5 8-22 * * *", SendEmailFileToExpert) //预约外呼名单,会前1小时自动发送邮件给专家组
-	//task.AddTask("sendEmailFileToExpert", sendEmailFileToExpert)
+	updateActivitySattus := task.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
+	task.AddTask("updateActivitySattus", updateActivitySattus)
+	//更新深 和新的标签
+	updateIndustrialManagementLabel := task.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
+	task.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
+	//更新报告的搜索栏内容
+	//UpdateIndustrialManagementSubjectNnames()
+	//会议提醒模板消息推送
+	sendActivityBeginMsg := task.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
+	task.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
+	sendActivityBeginMsgMeeting := task.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
+	task.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
+	//预约外呼名单,会前1小时自动发送邮件给专家组
+	sendEmailFileToExpert := task.NewTask("sendEmailFileToExpert", "0 */5 8-22 * * *", SendEmailFileToExpert) //预约外呼名单,会前1小时自动发送邮件给专家组
+	task.AddTask("sendEmailFileToExpert", sendEmailFileToExpert)
 
 	//editOutboundMobile := task.NewTask("editOutboundMobile", "0 */1 8-22 * * *", EditOutboundMobile) //同步外呼号码与手机号
 	//task.AddTask("sendEmailFileToExpert", editOutboundMobile)
-	editUserOutboundMobile := task.NewTask("editUserOutboundMobile", "0 36 21 * * *   ", EditUserOutboundMobile) //同步外呼号码与手机号
-	task.AddTask("editUserOutboundMobile", editUserOutboundMobile)
-
-	//UpdateActivitySattus()
+	//editUserOutboundMobile := task.NewTask("editUserOutboundMobile", "0 36 21 * * *   ", EditUserOutboundMobile) //同步外呼号码与手机号
+	//task.AddTask("editUserOutboundMobile", editUserOutboundMobile)
 	task.StartTask()
 	fmt.Println("end")
 }