Browse Source

🎈 perf: 优化部分细节

Pchen. 3 months ago
parent
commit
a70b3ffeb4
3 changed files with 13 additions and 1 deletions
  1. 6 0
      apis/Corn/StartAutoLepao.js
  2. 6 0
      apis/Corn/StartLepao.js
  3. 1 1
      apis/Lepao/Account/AddAccount.js

+ 6 - 0
apis/Corn/StartAutoLepao.js

@@ -36,6 +36,12 @@ class StartAutoLepao extends API {
                 const { name, create_user, student_num } = item
                 this.logger.info(`${name}(${student_num})开始乐跑`)
 
+                const isProgress = await Redis.get(`cgLepaoProgress:${student_num}`)
+                if (isProgress) {
+                    this.logger.info(`${name}(${student_num})已进入乐跑任务队列,请等待乐跑完成后再进行乐跑操作`)
+                    continue
+                }
+
                 const isSuccess = await Redis.get(`cgLepaoSuccess:${student_num}`)
                 if (isSuccess) {
                     this.logger.info(`${name}(${student_num})当天已乐跑成功,不执行自动乐跑`)

+ 6 - 0
apis/Corn/StartLepao.js

@@ -42,6 +42,12 @@ class StartLepao extends API {
                 const { name, create_user, student_num } = item
                 this.logger.info(`${name}(${student_num})开始补充乐跑`)
 
+                const isProgress = await Redis.get(`cgLepaoProgress:${student_num}`)
+                if (isProgress) {
+                    this.logger.info(`${name}(${student_num})已进入乐跑任务队列,请等待乐跑完成后再进行乐跑操作`)
+                    continue
+                }
+
                 const isSuccess = await Redis.get(`cgLepaoSuccess:${student_num}`)
                 if (isSuccess) {
                     this.logger.info(`${name}(${student_num})当天已乐跑成功,不执行补充乐跑`)

+ 1 - 1
apis/Lepao/Account/AddAccount.js

@@ -93,7 +93,7 @@ class AddAccount extends API {
                 userInfo = await lepaoUserInfo(student_num)
 
                 if (auto_run && userInfo.frequency >= target_count && target_count !== 0)
-                    return res.json({ ...BaseStdResponse.ERR, msg: '该账号累计跑步次数已达到目标次数,请尝试修改目标次数' })
+                    return res.json({ ...BaseStdResponse.ERR, msg: `该账号累计跑步次数(${userInfo.frequency})已达到目标次数,请尝试修改目标次数` })
             } catch (error) {
                 return res.json({ ...BaseStdResponse.ERR, msg: '获取用户信息失败,请联系客服或稍后再试' })
             }