|
@@ -891,8 +891,6 @@ func getBonusWeekDataMap() map[int64][]int { |
|
|
if strings.HasSuffix(filenames[i], "\r") { |
|
|
if strings.HasSuffix(filenames[i], "\r") { |
|
|
filenames[i] = filenames[i][0 : len(filenames[i])-len("\r")] |
|
|
filenames[i] = filenames[i][0 : len(filenames[i])-len("\r")] |
|
|
} |
|
|
} |
|
|
week, num := getWeekAndNum(filenames[i]) |
|
|
|
|
|
log.Info("filenames[i]=" + filenames[i] + "week=" + fmt.Sprint(week) + " num=" + fmt.Sprint(num)) |
|
|
|
|
|
url = setting.RecommentRepoAddr + "bonus/weekdata/" + filenames[i] |
|
|
url = setting.RecommentRepoAddr + "bonus/weekdata/" + filenames[i] |
|
|
csvContent, err1 := GetContentFromPromote(url) |
|
|
csvContent, err1 := GetContentFromPromote(url) |
|
|
if err1 == nil { |
|
|
if err1 == nil { |
|
@@ -910,6 +908,7 @@ func getBonusWeekDataMap() map[int64][]int { |
|
|
userId := getInt64Value(aLine[0]) |
|
|
userId := getInt64Value(aLine[0]) |
|
|
order := getIntValue(aLine[2]) |
|
|
order := getIntValue(aLine[2]) |
|
|
money := getIntValue(aLine[3]) |
|
|
money := getIntValue(aLine[3]) |
|
|
|
|
|
week, num := getWeekAndNum(filenames[i]) |
|
|
//log.Info("userId=" + fmt.Sprint(userId) + " order=" + fmt.Sprint(order) + " money=" + fmt.Sprint(money) + " week=" + fmt.Sprint(week) + " num=" + fmt.Sprint(num)) |
|
|
//log.Info("userId=" + fmt.Sprint(userId) + " order=" + fmt.Sprint(order) + " money=" + fmt.Sprint(money) + " week=" + fmt.Sprint(week) + " num=" + fmt.Sprint(num)) |
|
|
//email := lines[2] |
|
|
//email := lines[2] |
|
|
record, ok := bonusMap[userId] |
|
|
record, ok := bonusMap[userId] |
|
|