Browse Source

🐞 fix: 修复更新后自动乐跑不会考虑乐跑星期的问题

Pchen. 2 months ago
parent
commit
9937349974

+ 2 - 2
apis/Lepao/Account/UpdateAccount/UpdateAccount.js

@@ -55,7 +55,7 @@ class UpdateAccount extends API {
                     msg: '未提取出用户登录信息,请重试'
                 })
 
-            let findSql = 'SELECT email, create_user, auto_run FROM lepao_account WHERE student_num = ? AND create_user IS NOT NULL'
+            let findSql = 'SELECT email, create_user, auto_run, auto_day FROM lepao_account WHERE student_num = ? AND create_user IS NOT NULL'
             let findRows = await db.query(findSql, [student_num])
             if (!findRows)
                 return res.json({
@@ -100,7 +100,7 @@ class UpdateAccount extends API {
 
                 await EmailTemplate.updateSuccess(findRows[0].email, emailData)
 
-                if (findRows[0].auto_run === 1) {
+                if (findRows[0].auto_run === 1 && Array.isArray(findRows[0].auto_day) && findRows[0].auto_day.includes(new Date().getDay())) {
                     lepao.beginLepao(findRows[0].create_user, student_num, token, uid, school_id, 1)
                 }
             }

+ 5 - 4
apis/Lepao/Account/UpdateAccount/UpdateAccountAndroidApp.js

@@ -56,7 +56,7 @@ class UpdateAccountAndroidApp extends API {
                     msg: '未提取出用户登录信息,请重试'
                 })
 
-            let findSql = 'SELECT email, create_user, auto_run FROM lepao_account WHERE student_num = ? AND create_user IS NOT NULL'
+            let findSql = 'SELECT email, create_user, auto_run, auto_day FROM lepao_account WHERE student_num = ? AND create_user IS NOT NULL'
             let findRows = await db.query(findSql, [student_num])
             if (!findRows)
                 return res.json({
@@ -74,8 +74,8 @@ class UpdateAccountAndroidApp extends API {
 
             if (updateRows && updateRows.affectedRows > 0) {
                 let msg
-                if(findRows[0].auto_run === 1) {
-                    msg = `当前已开启自动乐跑,系统随后将自动进行乐跑。后续通知将发送到您的邮箱:${findRows[0].email}。请留意邮箱提醒。`
+                if (findRows[0].auto_run === 1) {
+                    msg = `当前已开启自动乐跑,系统将自动进行乐跑。后续通知将发送到您的邮箱:${findRows[0].email}。请留意邮箱提醒。`
                 }
                 else {
                     msg = `当前未开启自动乐跑,如需进行乐跑,请前往 RunForge 手动执行乐跑操作。后续通知将发送到您的邮箱:${findRows[0].email},请留意邮箱提醒。`
@@ -93,6 +93,7 @@ class UpdateAccountAndroidApp extends API {
                         msg
                     }
                 })
+
                 let emailData = {
                     name,
                     account: student_num,
@@ -103,7 +104,7 @@ class UpdateAccountAndroidApp extends API {
 
                 await EmailTemplate.updateSuccess(findRows[0].email, emailData)
 
-                if (findRows[0].auto_run === 1) {
+                if (findRows[0].auto_run === 1 && Array.isArray(findRows[0].auto_day) && findRows[0].auto_day.includes(new Date().getDay())) {
                     lepao.beginLepao(findRows[0].create_user, student_num, token, uid, school_id, 1)
                 }
             }