modify client api

controllers/client.go

@@ -506,12 +506,12 @@ func (server *ClientController) TaskReward() {
 			for _, task := range types {
 				if task.Id == item.TaskId {
 					item.Type = models.ModelType(task.Type).String()
-					if strings.Compare(item.Type, "unknown") == 0 {
-						item.Type = "base task"
-					}
 					item.BaseModel = task.BaseModel
 				}
 			}
+			if strings.Compare(item.Type, "unknown") == 0 {
+				item.Type = "base task"
+			}
 			workload := big.NewInt(item.Workload)
 			weiPerWorkload, _ := strconv.Atoi(value.Wei)
 			weiPerWorkloadBig := big.NewInt(int64(weiPerWorkload))

libs/cronjob/cronjob.go

@@ -268,7 +268,7 @@ func startRevenue() {
 	//spec := "01 01 00 * * ?"
 	//spec, _ := beego.AppConfig.String("debitTime")
 	//spec := "@every 1m"
-	spec := "@every 6h"
+	spec := "@every 1h"
 	//dbhost, _ := beego.AppConfig.String("postgreshost")
 	//dbport, _ := beego.AppConfig.Int("senderport")
 
@@ -276,7 +276,7 @@ func startRevenue() {
 	revenueTask.AddFunc(spec, func() {
 		logs.Debug("startRevenue revenueTask")
 
-		_, multipliers, err := checkMultiplier()
+		total, multipliers, err := checkMultiplier()
 		if err != nil {
 			return
 		}
@@ -288,7 +288,7 @@ func startRevenue() {
 			date := fmt.Sprintf(time.Format("2006-01-02"))
 			dates = append(dates, date)
 		}
-		if len(dates) <= 0 {
+		if total <= 0 {
 			dates = checkDate()
 		}
 		reaponse, err := getWeiPerWorkload(dates)
@@ -442,11 +442,14 @@ func insertMultiplier(data []models.WeiPerWorkloadStruct) error {
 		return err
 	}
 	defer sender.Close()
+	currentTime := time.Now()
+	currentTime = time.Date(currentTime.Year(), currentTime.Month(), currentTime.Day(), 0, 0, 0, 0, time.UTC)
 	for _, value := range data {
-		if strings.Compare(value.WeiPerWorkload, "0") == 0 {
+		temp, _ := time.Parse("2006-01-02", value.Date)
+		if strings.Compare(value.WeiPerWorkload, "0") == 0 && temp.Compare(currentTime) >= 0 {
 			continue
 		}
-		temp, _ := time.Parse("2006-01-02", value.Date)
+
 		nanoseconds := int64(uint64(temp.UnixNano()))
 		seconds := nanoseconds / 1e9