Merge branch 'eta_trial_fix'

models/eta_trial.go

@@ -40,9 +40,9 @@ func UpdateETATrialDisable(disableIds []int) (err error) {
 	return
 }
 
-func UpdateETATrialAdminDisable(mobiles string) (err error) {
+func UpdateETATrialAdminDisable(disableMobiles []string) (err error) {
 	o := orm.NewOrmUsingDB("weekly_trial")
-	sql := `UPDATE admin SET enabled = 0 WHERE mobile IN  (` + mobiles + `) `
-	_, err = o.Raw(sql).Exec()
+	sql := `UPDATE admin SET enabled = 0 WHERE mobile IN  (` + utils.GetOrmInReplace(len(disableMobiles)) + `) `
+	_, err = o.Raw(sql,disableMobiles).Exec()
 	return
 }

services/eta_trial.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"hongze/hongze_task/models"
 	"hongze/hongze_task/utils"
-	"strings"
 	"time"
 )
 
@@ -39,8 +38,7 @@ func ETATrialDisabled(cont context.Context) (err error) {
 		}
 	}
 	if len(disableMobiles) > 0 {
-		mobiles := strings.Join(disableMobiles, ",")
-		err = models.UpdateETATrialAdminDisable(mobiles)
+		err = models.UpdateETATrialAdminDisable(disableMobiles)
 		if err != nil {
 			return err
 		}

services/task.go

@@ -154,7 +154,7 @@ func Task() {
 	task.AddTask("定时生成上周纪要汇总", cygxLastWeekSummary)
 
 	//ETA试用客户 启用->禁用
-	eTATrialDisabled := task.NewTask("eTATrialDisabled", "0 15 2 * * *", ETATrialDisabled)
+	eTATrialDisabled := task.NewTask("eTATrialDisabled", "0 10 11 * * *", ETATrialDisabled)
 	task.AddTask("ETA试用客户 启用->禁用", eTATrialDisabled)
 
 	//英文研报客户 临时->终止