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

services/activity_points.go

@@ -1837,7 +1837,7 @@ func ActivitySpecialPointsBillSubmitMeetingReduce(log models.YanXuanActivityPoin
 }
 
 //func init() {
-//	SpecialActivityPointsBillRoadShowReduce(1893)
+//	SpecialActivityPointsBillRoadShowReduce(1895)
 //}
 
 // 13: 给公司添加路演，对应专项调研扣点处理
@@ -1986,6 +1986,7 @@ func SpecialActivityPointsBillRoadShowReduce(log models.YanXuanActivityPointsRed
 			}
 		} else {
 			if mapActivityPointsBill[keyBill] != nil && mapActivityPointsBill[keyBill].DoType == 1 {
+				mapOldResearcherId[keyBill] = true
 				userItem := mapActivityPointsBill[keyBill]
 				points := mapCompanyPoints[companyId] - userItem.BillDetailed
 				item.BillDetailed = -userItem.BillDetailed
@@ -2015,7 +2016,7 @@ func SpecialActivityPointsBillRoadShowReduce(log models.YanXuanActivityPointsRed
 
 	if len(itemsOld) > 0 {
 		for _, user := range itemsOld {
-			keyBill := fmt.Sprint(user.ResearcherId, "_CID", companyId)
+			keyBill := fmt.Sprint(user.ResearcherId, "_CID", user.CompanyId)
 			if mapOldResearcherId[keyBill] {
 				continue
 			}
@@ -2036,8 +2037,8 @@ func SpecialActivityPointsBillRoadShowReduce(log models.YanXuanActivityPointsRed
 			item.Total = fmt.Sprint(points, "次")
 			item.TableSource = utils.CYGX_OBJ_ROADSHOW
 
-			item.CompanyId = rsCalendar.CompanyId
-			item.CompanyName = rsCalendar.CompanyName
+			item.CompanyId = user.CompanyId
+			item.CompanyName = user.CompanyName
 			item.ResearcherId = user.ResearcherId
 			item.ResearcherName = user.ResearcherName
 			items = append(items, item)

services/task.go

@@ -179,8 +179,8 @@ func Task() {
 	//	task.AddTask("getArticleListByApi", getArticleListByApi)
 	//}
 
-	go UserLabelLogReduce() // 处理用户标签的队列消息
-	//go YanXuanActivityPointsBillReduce()                    // 处理研选活动扣点
+	go UserLabelLogReduce()                                 // 处理用户标签的队列消息
+	go YanXuanActivityPointsBillReduce()                    // 处理研选活动扣点
 	go UpdateArticleByRedis()                               // 处理策略平台同步过来的文章
 	go UpdateIndustrialManagementTimeLineDateList3ByRedis() // 处理产业管理时间线相关内容的数据
 	go UpdateWxUserRaiLabelRedis()                          // 处理用户标签队列消息CRM_16.5