Merge branch 'eta_trial_fix' into debug

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"
 )
 
@@ -29,7 +28,7 @@ func ETATrialDisabled(cont context.Context) (err error) {
 	disableMobiles := make([]string, 0)
 	for _, v := range items {
 		disableIds = append(disableIds, v.EtaTrialId)
-		disableMobiles = append(disableMobiles, "'" + v.Mobile + "'")
+		disableMobiles = append(disableMobiles, v.Mobile )
 	}
 
 	if len(disableIds) > 0 {
@@ -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
 		}

utils/constants.go

@@ -22,7 +22,7 @@ const (
 
 const (
 	APPNAME          = "弘则-task"
-	EmailSendToUsers = "317699326@qq.com;984198890@qq.com;512188925@qq.com"
+	EmailSendToUsers = "317699326@qq.com;984198890@qq.com;512188925@qq.com;1404741809@qq.com"
 	//RefreshEdbInfoEmailSendToUsers = "317699326@qq.com;984198890@qq.com;jhwang@hzinsights.com;lnyan@hzinsights.com;vwang@hzinsights.com"
 	RefreshEdbInfoEmailSendToUsers = "317699326@qq.com;984198890@qq.com"
 )