Commit f211ebb5 authored by brent's avatar brent

modify startRevenue

parent 42202bd0
No preview for this file type
......@@ -367,6 +367,23 @@ func weiToAGI(wei *big.Int) *big.Float {
return agi
}
func removeDuplicates(arr []models.WeiStruct) []models.WeiStruct {
// 创建一个 map 来存储数组中的元素
elementMap := make(map[time.Time]bool)
result := []models.WeiStruct{}
// 遍历数组,将每个元素添加到 map 中
for _, elem := range arr {
// 如果 map 中不存在该元素,则将其添加到结果数组中
if !elementMap[elem.Time] {
elementMap[elem.Time] = true
result = append(result, elem)
}
}
return result
}
func (server *ClientController) TaskReward() {
body := server.Ctx.Input.RequestBody
appRequest := models.AppRequest{}
......@@ -498,6 +515,7 @@ func (server *ClientController) TaskReward() {
//}
sql = fmt.Sprintf("SELECT * FROM reward_multiplier WHERE time in(%s) ORDER BY time DESC;", dateString)
wei, err := postgres.QueryWei(sql)
wei = removeDuplicates(wei)
//return total, data, err
for _, value := range wei {
key := value.Time.Format(format)
......@@ -678,6 +696,7 @@ func (server *ClientController) IncomeRecord() {
//}
sql = fmt.Sprintf("SELECT * FROM reward_multiplier WHERE time in(%s) ORDER BY time DESC;", dateString)
wei, err := postgres.QueryWei(sql)
wei = removeDuplicates(wei)
for _, value := range wei {
key := value.Time.Format(format)
bills := groupedItems[key]
......
......@@ -277,6 +277,7 @@ func startRevenue() {
logs.Debug("startRevenue revenueTask")
total, multipliers, err := checkMultiplier()
logs.Debug("checkMultiplier total,multipliers", total, multipliers, err)
if err != nil {
return
}
......@@ -288,8 +289,10 @@ func startRevenue() {
date := fmt.Sprintf(time.Format("2006-01-02"))
dates = append(dates, date)
}
logs.Debug("checkMultiplier dates,begore", dates)
if total <= 0 {
dates = checkDate()
logs.Debug("checkMultiplier dates if checkDate", dates)
}
reaponse, err := getWeiPerWorkload(dates)
if err != nil {
......@@ -400,12 +403,12 @@ func getWeiPerWorkload(dates []string) ([]models.WeiPerWorkloadStruct, error) {
return nil, err
}
defer resp.Body.Close()
logs.Info("getWeiPerWorkload resp code", resp.StatusCode)
body, err := io.ReadAll(resp.Body)
if err != nil {
logs.Info("Error reading response:", err)
return nil, err
}
logs.Info("getWeiPerWorkload resp body", string(body))
var response models.WeiPerWorkloadResponse
if err := json.Unmarshal(body, &response); err != nil {
logs.Info("Error Unmarshal response:", err)
......@@ -446,6 +449,7 @@ func insertMultiplier(data []models.WeiPerWorkloadStruct) error {
currentTime = time.Date(currentTime.Year(), currentTime.Month(), currentTime.Day(), 0, 0, 0, 0, time.UTC)
for _, value := range data {
temp, _ := time.Parse("2006-01-02", value.Date)
logs.Debug("insertMultiplier", temp, currentTime, value.WeiPerWorkload)
if strings.Compare(value.WeiPerWorkload, "0") == 0 && temp.Compare(currentTime) >= 0 {
continue
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment