diff --git a/scripts/migrate_paid_users.go b/scripts/migrate_paid_users.go index 4718b20..a7f72d3 100644 --- a/scripts/migrate_paid_users.go +++ b/scripts/migrate_paid_users.go @@ -276,13 +276,13 @@ func main() { SELECT user_id AS uid FROM ` + "`order`" + ` WHERE status = ? AND user_id > 0 UNION SELECT user_id AS uid FROM apple_iap_transactions WHERE user_id > 0 + UNION + SELECT user_id AS uid FROM user_subscribe WHERE user_id > 0 AND (expire_time IS NULL OR expire_time > NOW()) ) t - INNER JOIN user_subscribe s ON s.user_id = t.uid INNER JOIN user u ON u.id = t.uid - WHERE (s.expire_time IS NULL OR s.expire_time > NOW()) - AND u.id NOT IN ( + WHERE u.id NOT IN ( SELECT user_id FROM user_auth_methods WHERE auth_type = 'email' AND auth_identifier = 'devneeds52@gmail.com' - ) + ) ORDER BY t.uid `, orderStatusCompleted).Scan(&paidIDs).Error if err != nil { diff --git a/说明文档.md b/说明文档.md index a7c9b27..4b2f60b 100644 --- a/说明文档.md +++ b/说明文档.md @@ -25,7 +25,7 @@ certbot certonly --manual --preferred-challenges dns -d airoport.win -d "*.airop | docker exec -i ppanel-mysql mysql -uroot -pjpcV41ppanel -go run scripts/migrate_paid_users.go -src 'root:rootpassword@tcp(127.0.0.1:3306)/ppanel?charset=utf8mb4&parseTime=True&loc=Local' -dst 'root:jpcV41ppanel@tcp(154.12.35.103:3306)/ppanel?charset=utf8mb4&parseTime=True&loc=Local' -clean +go run scripts/migrate_paid_users.go -src 'root:rootpassword@tcp(127.0.0.1:3306)/ppanel?charset=utf8mb4&parseTime=True&loc=Local' -dst 'root:jpcV41ppanel@tcp(103.150.215.44:3306)/hifast?charset=utf8mb4&parseTime=True&loc=Local' -clean