services/reward/admin_operate.go

@@ -51,7 +51,7 @@ func AdminBalanceOperate(req models.AdminRewardOperateReq, doer *models.User) er
 	return nil
 }
 
-func GetCSVFailedDatas(user *models.User, records [][]string) ([]models.CSVFailedData, int) {
+func GetCSVFailedDatas(admimUser *models.User, records [][]string) ([]models.CSVFailedData, int) {
 	var SuccessNum int
 	var CSVFailedDatas []models.CSVFailedData
 	var RewardOperateType models.RewardOperateType
@@ -77,12 +77,12 @@ func GetCSVFailedDatas(user *models.User, records [][]string) ([]models.CSVFaile
 		}
 
 		targetUserId, _ := strconv.ParseInt(userId, 10, 64)
-		user, err := models.GetUserByID(targetUserId)
+		targetUser, err := models.GetUserByID(targetUserId)
 		if err != nil {
 			CSVFailedDatas = append(CSVFailedDatas, models.CSVFailedData{pointUser, "userid not found"})
 			continue
 		}
-		if userName != user.Name {
+		if userName != targetUser.Name {
 			CSVFailedDatas = append(CSVFailedDatas, models.CSVFailedData{pointUser, "userName not found"})
 			continue
 		}
@@ -110,7 +110,7 @@ func GetCSVFailedDatas(user *models.User, records [][]string) ([]models.CSVFaile
 			Amount:       amountNum,
 			Remark:       remark,
 			RewardType:   models.RewardTypePoint,
-		}, user)
+		}, admimUser)
 		if err != nil {
 			log.Error("OperatePointAccountBalance error.%v", err)
 			CSVFailedDatas = append(CSVFailedDatas, models.CSVFailedData{pointUser, "OperatePointAccountBalance error."})