Browse Source

no message

xingzai 1 year ago
parent
commit
7723c60723
4 changed files with 11 additions and 10 deletions
  1. 5 5
      controllers/activity.go
  2. 1 0
      services/activity.go
  3. 3 3
      services/activity_signup.go
  4. 2 2
      services/task.go

+ 5 - 5
controllers/activity.go

@@ -2414,12 +2414,12 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		br.ErrMsg = "获取活动【新】标签Map失败, Err: " + e.Error()
 		br.ErrMsg = "获取活动【新】标签Map失败, Err: " + e.Error()
 		return
 		return
 	}
 	}
-	for k, v := range list {
-		if v.ActivityTypeId == 1 {
-			for k2 := range list[k].List {
-				list[k].List[k2].IsNew = newLabelMap[list[k].List[k2].ActivityId]
-			}
+	for k, _ := range list {
+		//if v.ActivityTypeId == 1 {
+		for k2 := range list[k].List {
+			list[k].List[k2].IsNew = newLabelMap[list[k].List[k2].ActivityId]
 		}
 		}
+		//}
 	}
 	}
 
 
 	var itemsNew []*models.ActivityTypeHome
 	var itemsNew []*models.ActivityTypeHome

+ 1 - 0
services/activity.go

@@ -2373,6 +2373,7 @@ func GetActivityNewLabelMap(activityIds []int) (labelMap map[int]bool, industryN
 	for k := range articNewLabel {
 	for k := range articNewLabel {
 		labelMap[k] = true
 		labelMap[k] = true
 	}
 	}
+	fmt.Println(labelMap[2374])
 
 
 	return
 	return
 }
 }

+ 3 - 3
services/activity_signup.go

@@ -94,7 +94,7 @@ func CheckActivityPoints(activityInfo *models.ActivityDetail, wxUser *models.WxU
 		//获取活动对用户要扣的点
 		//获取活动对用户要扣的点
 		userPointsNum, e := models.GetCygxActivityPointsSetUserNum(activityInfo.ActivityId)
 		userPointsNum, e := models.GetCygxActivityPointsSetUserNum(activityInfo.ActivityId)
 		if e != nil {
 		if e != nil {
-			err = errors.New("GetActivitySignupSuccessByUserCountNoHz, Err: " + e.Error())
+			err = errors.New("GetCygxActivityPointsSetUserNum, Err: " + e.Error())
 			return
 			return
 		}
 		}
 		// 获取用户所在公司剩余的点
 		// 获取用户所在公司剩余的点
@@ -105,7 +105,7 @@ func CheckActivityPoints(activityInfo *models.ActivityDetail, wxUser *models.WxU
 		}
 		}
 		if companyPointsNum-userPointsNum < 0 {
 		if companyPointsNum-userPointsNum < 0 {
 			checkPoints = false
 			checkPoints = false
-			popupMsg = "点数不足,若想报名,\n请联系对口销售充值\n\n当前剩余点数:0\n本次会议扣除点数:0.5"
+			popupMsg = "点数不足,若想报名,\n请联系对口销售充值"
 		}
 		}
 		companyPoints = fmt.Sprint(companyPointsNum)
 		companyPoints = fmt.Sprint(companyPointsNum)
 		activityPoints = fmt.Sprint(userPointsNum)
 		activityPoints = fmt.Sprint(userPointsNum)
@@ -125,7 +125,7 @@ func CheckActivityUserEmail(activityInfo *models.ActivityDetail, wxUser *models.
 	return
 	return
 }
 }
 
 
-// 校验报名是否需要绑定邮箱
+// // 校验报名顺序 截止时间>点数>邮箱
 func CheckActivityUserAll(activityInfo *models.ActivityDetail, wxUser *models.WxUserItem) (popupMsg string, err error) {
 func CheckActivityUserAll(activityInfo *models.ActivityDetail, wxUser *models.WxUserItem) (popupMsg string, err error) {
 	_, popupMsg = CheckSiginupDeadline(activityInfo)
 	_, popupMsg = CheckSiginupDeadline(activityInfo)
 	if popupMsg != "" {
 	if popupMsg != "" {

+ 2 - 2
services/task.go

@@ -126,8 +126,8 @@ func Task() {
 		task.AddTask("getArticleListByApi", getArticleListByApi)
 		task.AddTask("getArticleListByApi", getArticleListByApi)
 	}
 	}
 
 
-	go UserLabelLogReduce() // 处理用户标签的队列消息
-	//go YanXuanActivityPointsBillReduce() // 处理研选活动扣点
+	go UserLabelLogReduce()              // 处理用户标签的队列消息
+	go YanXuanActivityPointsBillReduce() // 处理研选活动扣点
 	//GetCygxActivityAttendanceDetail()
 	//GetCygxActivityAttendanceDetail()
 	//CreateIndexNameArticleHistory()
 	//CreateIndexNameArticleHistory()
 	//AddAllArticleHistory()
 	//AddAllArticleHistory()