no message

models/activity.go

@@ -1121,6 +1121,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			art.activity_time,
 			art.is_external_label,
 			art.siginup_deadline,
+			art.siginup_deadline,
 			art.is_research_points
 		FROM
 			cygx_activity AS art
@@ -1156,6 +1157,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			art.activity_time,
 			"",
 			"",
+			"",
 			""
 		FROM
 			cygx_activity_special AS art

services/activity_points.go

@@ -350,62 +350,13 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 	item := new(models.CygxActivityPointsBill)
 	var itemCompanys []*models.CygxActivityPointsCompany
 	itemCompany := new(models.CygxActivityPointsCompany)
-	if activityPointsBillDetail == nil { //如果是空的就添加
-		//获取需要添加的流水信息
 
-		pars = make([]interface{}, 0)
-		condition = ` AND activity_id = ? AND company_id != ? AND company_id > 0 AND mobile = ''   ORDER BY id DESC LIMIT 1  `
-		pars = append(pars, activityId, comapnyId)
-
-		activityPointsBillDetailOld, e := models.GetCygxActivityPointsBillDetailByCondition(condition, pars)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = errors.New("GetCompanyPoints, Err: " + e.Error())
-			return
-		}
-		//判断是否有变更过过公司,如果有变更那么就对上一家公司进行返点
-		if activityPointsBillDetailOld != nil {
-			comapnyIdOld := activityPointsBillDetailOld.CompanyId
-			//如果公司进行变更，那么就对原有的公司进行返点处理
-			if comapnyIdOld != comapny.CompanyId {
-				comapnyOld, e := models.GetCompanyById(comapnyIdOld)
-				if e != nil {
-					err = errors.New("GetCompanyById" + e.Error())
-					return
-				}
-				// 获取用户所在公司剩余的点
-				companyPointsNumOld, e := models.GetCompanyPoints(comapnyOld.CompanyId)
-				if e != nil && e.Error() != utils.ErrNoRow() {
-					err = errors.New("GetCompanyPoints, Err: " + e.Error())
-					return
-				}
+	pars = make([]interface{}, 0)
+	condition = ` AND activity_id = ? AND company_id != ? AND company_id > 0 AND mobile = ''   ORDER BY id DESC LIMIT 1  `
+	pars = append(pars, activityId, comapnyId)
 
-				itemOld := new(models.CygxActivityPointsBill)
-				//item.UserId = user.UserId
-				itemOld.ActivityId = activityId
-				itemOld.CreateTime = time.Now()
-				//item.Mobile = user.Mobile
-				//item.Email = user.Email
-				itemOld.CompanyId = comapnyOld.CompanyId
-				itemOld.CompanyName = comapnyOld.CompanyName
-				//item.RealName = user.RealName
-				itemOld.BillDetailed = activityPointsSetDetail.CompanyPointsNum
-				itemOld.RegisterPlatform = log.RegisterPlatform
-				itemOld.AdminId = log.AdminId
-				itemOld.Source = log.Source
-				itemOld.ChartPermissionId = activityInfo.ChartPermissionId
-				itemOld.DoType = 2
-				itemOld.Content = activityInfo.ActivityName + "--取消办会"
-				itemOld.Points = companyPointsNumOld + activityPointsSetDetail.CompanyPointsNum
-				items = append(items, itemOld)
-
-				itemCompanyOld := new(models.CygxActivityPointsCompany)
-				//更新对应机构的剩余点数
-				itemCompanyOld.CompanyId = comapnyOld.CompanyId
-				itemCompanyOld.Points = itemOld.Points
-				itemCompanyOld.ModifyTime = time.Now()
-				itemCompanys = append(itemCompanys, itemCompanyOld)
-			}
-		}
+	if activityPointsBillDetail == nil { //如果是空的就添加
+		//获取需要添加的流水信息
 		//item.UserId = user.UserId
 		item.ActivityId = activityId
 		item.CreateTime = time.Now()
@@ -435,11 +386,23 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 			return
 		}
 	} else {
-		//如果存在就进行对比修改
-		if activityPointsSetDetail.CompanyPointsNum != activityPointsBillDetail.BillDetailed {
-			item.Id = activityPointsBillDetail.Id
+		if activityPointsBillDetail.BillDetailed > 0 {
+			//item.UserId = user.UserId
+			item.ActivityId = activityId
+			item.CreateTime = time.Now()
+			//item.Mobile = user.Mobile
+			//item.Email = user.Email
+			item.CompanyId = comapny.CompanyId
+			item.CompanyName = comapny.CompanyName
+			//item.RealName = user.RealName
 			item.BillDetailed = -activityPointsSetDetail.CompanyPointsNum
-			item.Points = companyPointsNum - activityPointsBillDetail.BillDetailed - activityPointsSetDetail.CompanyPointsNum
+			item.RegisterPlatform = log.RegisterPlatform
+			item.AdminId = log.AdminId
+			item.Source = log.Source
+			item.ChartPermissionId = activityInfo.ChartPermissionId
+			item.DoType = 1
+			item.Content = activityInfo.ActivityName + "--办会"
+			item.Points = companyPointsNum - activityPointsSetDetail.CompanyPointsNum
 			items = append(items, item)
 
 			//更新对应机构的剩余点数
@@ -447,12 +410,32 @@ func YanXuanActivityPointsBillActivityEditReduce(log models.YanXuanActivityPoint
 			itemCompany.Points = item.Points
 			itemCompany.ModifyTime = time.Now()
 			itemCompanys = append(itemCompanys, itemCompany)
-			e = models.UpdateCygxActivityPointsBillMulti(items, itemCompanys)
+			e = models.AddCygxActivityPointsBillMulti(items, itemCompanys)
 			if e != nil && e.Error() != utils.ErrNoRow() {
-				err = errors.New("UpdateCygxActivityPointsBillMulti, Err: " + e.Error())
+				err = errors.New("AddCygxActivityPointsBillMulti, Err: " + e.Error())
 				return
 			}
+		} else {
+			//如果存在就进行对比修改
+			if activityPointsSetDetail.CompanyPointsNum != -activityPointsBillDetail.BillDetailed {
+				item.Id = activityPointsBillDetail.Id
+				item.BillDetailed = -activityPointsSetDetail.CompanyPointsNum
+				item.Points = companyPointsNum - activityPointsBillDetail.BillDetailed - activityPointsSetDetail.CompanyPointsNum
+				items = append(items, item)
+
+				//更新对应机构的剩余点数
+				itemCompany.CompanyId = comapny.CompanyId
+				itemCompany.Points = item.Points
+				itemCompany.ModifyTime = time.Now()
+				itemCompanys = append(itemCompanys, itemCompany)
+				e = models.UpdateCygxActivityPointsBillMulti(items, itemCompanys)
+				if e != nil && e.Error() != utils.ErrNoRow() {
+					err = errors.New("UpdateCygxActivityPointsBillMulti, Err: " + e.Error())
+					return
+				}
+			}
 		}
+
 	}
 	return
 }
@@ -726,7 +709,7 @@ func YanXuanActivityPointsBillSubmitMeetingReduce(log models.YanXuanActivityPoin
 	}
 	//return
 	for _, v := range conpanyList {
-		if mapCompanyPoints[v.CompanyId] != 0 {
+		if v.CompanyId != 0 {
 			mapCompanyPoints[v.CompanyId] = v.Points
 		}
 	}
@@ -753,25 +736,34 @@ func YanXuanActivityPointsBillSubmitMeetingReduce(log models.YanXuanActivityPoin
 			item.BillDetailed = -activityPointsSetDetail.UserPointsNum
 			item.DoType = 1
 			item.Content = activityInfo.ActivityName + "--活动到会"
-			item.Points = mapCompanyPoints[user.CompanyId] - activityPointsSetDetail.CompanyPointsNum
+			item.Points = mapCompanyPoints[user.CompanyId] - activityPointsSetDetail.UserPointsNum
 			items = append(items, item)
+			//更新对应机构的剩余点数
+			itemCompany := new(models.CygxActivityPointsCompany)
+			itemCompany.CompanyId = user.CompanyId
+			itemCompany.Points = item.Points
+			itemCompany.ModifyTime = time.Now()
+			itemCompanys = append(itemCompanys, itemCompany)
+			mapCompanyPoints[user.CompanyId] = item.Points
 		} else {
 			//第二次提交改成未到会的，对其进行返点处理
 			if mapActivityPointsBill[user.Mobile].BillDetailed < 0 {
 				item.BillDetailed = activityPointsSetDetail.UserPointsNum
 				item.DoType = 2
 				item.Content = activityInfo.ActivityName + "--活动取消到会"
-				item.Points = mapCompanyPoints[user.CompanyId] + activityPointsSetDetail.CompanyPointsNum
+				item.Points = mapCompanyPoints[user.CompanyId] + activityPointsSetDetail.UserPointsNum
 				items = append(items, item)
+
+				//更新对应机构的剩余点数
+				itemCompany := new(models.CygxActivityPointsCompany)
+				itemCompany.CompanyId = user.CompanyId
+				itemCompany.Points = item.Points
+				itemCompany.ModifyTime = time.Now()
+				itemCompanys = append(itemCompanys, itemCompany)
+				mapCompanyPoints[user.CompanyId] = item.Points
 			}
 		}
-		//更新对应机构的剩余点数
-		itemCompany := new(models.CygxActivityPointsCompany)
-		itemCompany.CompanyId = user.CompanyId
-		itemCompany.Points = item.Points
-		itemCompany.ModifyTime = time.Now()
-		itemCompanys = append(itemCompanys, itemCompany)
-		mapCompanyPoints[user.CompanyId] = item.Points
+
 	}
 	e = models.AddCygxActivityPointsBillMulti(items, itemCompanys)
 	if e != nil && e.Error() != utils.ErrNoRow() {

services/task.go

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