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

services/activity_points.go

@@ -565,8 +565,8 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 				}
 
 				for _, v := range conpanyList {
-					if mapCompanyPoints[comapnyId] == 0 {
-						mapCompanyPoints[comapnyId] = v.Points
+					if mapCompanyPoints[v.CompanyId] == 0 {
+						mapCompanyPoints[v.CompanyId] = v.Points
 					}
 				}
 
@@ -587,8 +587,8 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 					item.ChartPermissionId = activityInfo.ChartPermissionId
 					item.DoType = 1
 					item.Content = activityInfo.ActivityName + "--发布活动"
-					mapCompanyPoints[comapnyId] -= activityPointsSetDetail.UserPointsNum //通过map处理机构剩余点数
-					item.Points = mapCompanyPoints[comapnyId]
+					mapCompanyPoints[user.CompanyId] -= activityPointsSetDetail.UserPointsNum //通过map处理机构剩余点数
+					item.Points = mapCompanyPoints[user.CompanyId]
 					items = append(items, item)
 
 					//更新对应机构的剩余点数
@@ -597,7 +597,7 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 					itemCompany.Points = item.Points
 					itemCompany.ModifyTime = time.Now()
 					itemCompanys = append(itemCompanys, itemCompany)
-					mapCompanyPoints[comapnyId] = item.Points
+					mapCompanyPoints[user.CompanyId] = item.Points
 				}
 			}
 		}
@@ -673,8 +673,8 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 				}
 
 				for _, v := range conpanyList {
-					if mapCompanyPoints[comapnyId] == 0 {
-						mapCompanyPoints[comapnyId] = v.Points
+					if mapCompanyPoints[v.CompanyId] == 0 {
+						mapCompanyPoints[v.CompanyId] = v.Points
 					}
 				}
 
@@ -695,8 +695,8 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 					item.ChartPermissionId = activityInfo.ChartPermissionId
 					item.DoType = 2
 					item.Content = activityInfo.ActivityName + "--取消活动"
-					mapCompanyPoints[comapnyId] += activityPointsSetDetail.UserPointsNum //通过map处理机构剩余点数
-					item.Points = mapCompanyPoints[comapnyId]
+					mapCompanyPoints[user.CompanyId] += activityPointsSetDetail.UserPointsNum //通过map处理机构剩余点数
+					item.Points = mapCompanyPoints[user.CompanyId]
 					items = append(items, item)
 
 					//更新对应机构的剩余点数
@@ -705,12 +705,11 @@ func YanXuanActivityPointsBillActivityPublishAndCancelReduce(log models.YanXuanA
 					itemCompany.Points = item.Points
 					itemCompany.ModifyTime = time.Now()
 					itemCompanys = append(itemCompanys, itemCompany)
-					mapCompanyPoints[comapnyId] = item.Points
+					mapCompanyPoints[user.CompanyId] = item.Points
 				}
 			}
 		}
 	}
-
 	e = models.AddCygxActivityPointsBillMulti(items, itemCompanys)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("AddCygxActivityPointsBillMulti, Err: " + e.Error())

services/task.go

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