zhangchuanxing 2 недель назад
Родитель
Сommit
f75bee1c41
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      services/activity_points.go

+ 2 - 1
services/activity_points.go

@@ -1947,6 +1947,7 @@ func SpecialActivityPointsBillRoadShowReduce(log models.YanXuanActivityPointsRed
 	var itemCompanys []*models.CygxActivitySpecialPermissionPoints
 	//mapResearcherId := make(map[int]bool)
 	for _, user := range researcherList {
+		keyBill := fmt.Sprint(user.ResearcherId, "_CID", companyId)
 		//mapResearcherId[user.ResearcherId] = true
 		item := new(models.CygxActivitySpecialTripBill)
 		item.ActivityId = activityId
@@ -1962,7 +1963,7 @@ func SpecialActivityPointsBillRoadShowReduce(log models.YanXuanActivityPointsRed
 		item.TableSource = utils.CYGX_OBJ_ROADSHOW
 
 		//如果没有扣点记录就对他们进行扣点处理
-		if mapActivityPointsBill[user.ResearcherId] == nil || mapActivityPointsBill[user.ResearcherId].BillDetailed > 0 {
+		if mapActivityPointsBill[keyBill] == nil || mapActivityPointsBill[keyBill].DoType == 2 {
 			points := mapCompanyPoints[companyId] + billDetailed
 			item.BillDetailed = billDetailed
 			item.DoType = 1