Merge branch 'cygx_kd' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/activity_points.go

@@ -479,7 +479,8 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 	if activityPointsSetDetail == nil {
 		return
 	}
-	if activityPointsSetDetail.CompanyPointsNum == 0 && activityPointsSetDetail.PointsType == 2 {
+	//if activityPointsSetDetail.CompanyPointsNum == 0 && activityPointsSetDetail.PointsType == 2 {
+	if activityPointsSetDetail.CompanyPointsNum == 0 {
 		return // 如果不是办会人扣点,且对用户是到会扣点的这种形式，那么就不做任何处理
 	}
 

services/task.go

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