Browse Source

报名信息取消时删除对应数据

xingzai 3 years ago
parent
commit
ed9b085565
5 changed files with 19 additions and 29 deletions
  1. 9 12
      controllers/activity.go
  2. 1 1
      models/activity_meeting_reminder.go
  3. 2 1
      models/activity_signup.go
  4. 7 1
      services/tactics.go
  5. 0 14
      services/task.go

+ 9 - 12
controllers/activity.go

@@ -416,11 +416,6 @@ func (this *ActivityCoAntroller) SignupAdd() {
 			return
 		}
 		companyItem, err := models.GetCompanyDetailAllById(user.CompanyId)
-		//if err != nil {
-		//	br.Msg = "获取信息失败"
-		//	br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
-		//	return
-		//}
 		//冻结客户
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {
@@ -488,13 +483,13 @@ func (this *ActivityCoAntroller) SignupAdd() {
 						signupStatus = "FullStarffed"
 						item.FailType = 1
 					}
-					total, err = models.GetActivitySignupCount(uid, activityId)
-					if err != nil {
-						br.Msg = "获取失败"
-						br.ErrMsg = "获取失败,Err:" + err.Error()
-						return
-					}
-					if signupStatus != "Success" && total == 0 {
+					//total, err = models.GetActivitySignupCount(uid, activityId)
+					//if err != nil {
+					//	br.Msg = "获取失败"
+					//	br.ErrMsg = "获取失败,Err:" + err.Error()
+					//	return
+					//}
+					if signupStatus != "Success" && item.FailType > 0 {
 						item.UserId = uid
 						item.ActivityId = activityId
 						item.CreateTime = time.Now()
@@ -503,6 +498,7 @@ func (this *ActivityCoAntroller) SignupAdd() {
 						item.CompanyId = user.CompanyId
 						item.CompanyName = user.CompanyName
 						item.SignupType = signupType
+						item.DoFailType = item.FailType
 						//添加报名信息,但是不加入日程
 						_, errSignup := models.AddActivitySignupNoSchedule(item)
 						if errSignup != nil {
@@ -532,6 +528,7 @@ func (this *ActivityCoAntroller) SignupAdd() {
 					item.CompanyName = user.CompanyName
 					item.SignupType = signupType
 					item.FailType = 0
+					item.DoFailType = 0
 					_, errSignup := models.AddActivitySignup(item)
 					if errSignup != nil {
 						br.Msg = "操作失败"

+ 1 - 1
models/activity_meeting_reminder.go

@@ -121,7 +121,7 @@ func CancelActivityMeetingReminder(item *CygxActivityMeetingReminder) (lastId in
 			return
 		}
 	}
-	sql = `UPDATE cygx_activity_meeting_reminder SET is_cancel = 1  WHERE user_id=?  AND activity_id=? `
+	sql = `DELETE  FROM cygx_activity_meeting_reminder   WHERE user_id=?  AND activity_id=? `
 	_, err = o.Raw(sql, item.UserId, item.ActivityId).Exec()
 	if err != nil {
 		return

+ 2 - 1
models/activity_signup.go

@@ -17,6 +17,7 @@ type CygxActivitySignup struct {
 	CompanyName string    `description:"公司名称"`
 	FailType    int       `description:"失败原因,0,未失败,1总人数已满,2单机构超限制,3,爽约次数超限"`
 	SignupType  int       `description:"报名方式,1预约外呼,2自主拨入,3我要报名"`
+	DoFailType  int       `description:"失败原因,0,未失败,1总人数已满,2单机构超限制,3,爽约次数超限"`
 }
 
 type SignupStatus struct {
@@ -211,7 +212,7 @@ func CancelActivitySignup(item *CygxActivitySignup) (lastId int64, err error) {
 			return
 		}
 	}
-	sql = `UPDATE cygx_activity_signup SET is_cancel = 1  WHERE user_id=?  AND activity_id=? `
+	sql = `DELETE  FROM cygx_activity_signup   WHERE user_id=?  AND activity_id=? `
 	_, err = o.Raw(sql, item.UserId, item.ActivityId).Exec()
 	if err != nil {
 		return

+ 7 - 1
services/tactics.go

@@ -717,6 +717,11 @@ func BodyAnalysis2(body string) (expertNumStr, expertContentStr, interviewDateSt
 }
 
 func GetSummarytoEs() (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println("同步失败,Err:", err.Error())
+		}
+	}()
 	endDate := time.Now().AddDate(0, 0, -30).Format(utils.FormatDate)
 	//allList, err := models.GetArticleAll()
 	allList, err := models.GetArticleAllDate(endDate)
@@ -730,7 +735,7 @@ func GetSummarytoEs() (err error) {
 		doc, err := goquery.NewDocumentFromReader(strings.NewReader(content))
 		if err != nil {
 			fmt.Println("create doc err:", err.Error())
-			return
+			return err
 		}
 		bodyText := doc.Text()
 		item := new(ElasticTestArticleDetail)
@@ -741,4 +746,5 @@ func GetSummarytoEs() (err error) {
 		EsAddOrEditData(indexName, strconv.Itoa(v.ArticleId), item)
 		fmt.Println(v.ArticleId)
 	}
+	return
 }

+ 0 - 14
services/task.go

@@ -51,20 +51,6 @@ func Task() {
 
 	toolbox.StartTask()
 
-	//if utils.RunMode == "debug" {
-	//	//syncTacticsList := toolbox.NewTask("syncTacticsList", "0 */5 * * * *", SyncTacticsList)
-	//	//toolbox.AddTask("syncTacticsList", syncTacticsList)
-	//	//toolbox.StartTask()
-	//	syncTacticsListAddreport := toolbox.NewTask("syncTacticsListAddreport", "0 01 01 * * *", SyncTacticsListAddreport)
-	//	toolbox.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
-	//
-	//	//同步纪要库中的Es
-	//	syncTacticsListToEs := toolbox.NewTask("syncTacticsListToEs", "0 01 01 * * *", SyncTacticsListToEs)
-	//	toolbox.AddTask("syncTacticsListToEs", syncTacticsListToEs)
-	//	toolbox.StartTask()
-	//}
-	//syncTacticsListAddreport := toolbox.NewTask("syncTacticsListAddreport", "0 42 09 * * *", SyncTacticsListAddreport)
-	//toolbox.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
 	//toolbox.StartTask()
 	//AddAllArticle()
 	//SyncTacticsListToEs()