Browse Source

✨ feat: 增加自动乐跑时段设置

Pchen. 9 months ago
parent
commit
a6624a0a2c
4 changed files with 11 additions and 10 deletions
  1. 3 2
      apis/Corn/StartAutoLepao.js
  2. 6 7
      apis/Lepao/AddAccount.js
  3. 1 0
      apis/Lepao/GetAccount.js
  4. 1 1
      lib/Lepao/Lepao.js

+ 3 - 2
apis/Corn/StartAutoLepao.js

@@ -17,9 +17,10 @@ class StartAutoLepao extends API {
                 ...BaseStdResponse.OK
                 ...BaseStdResponse.OK
             })
             })
 
 
+            const hour = new Date().getHours()
             this.logger.info('开始执行自动乐跑任务')
             this.logger.info('开始执行自动乐跑任务')
-            let sql = 'SELECT name, create_user, student_num, token, uid, school_id, state FROM lepao_account WHERE auto_run = 1'
-            let r = await db.query(sql)
+            let sql = 'SELECT name, create_user, student_num, token, uid, school_id, state FROM lepao_account WHERE auto_run = 1 AND auto_time = ?'
+            let r = await db.query(sql, [hour])
             if (!r)
             if (!r)
                 return this.logger.error('获取自动乐跑账号失败!')
                 return this.logger.error('获取自动乐跑账号失败!')
 
 

+ 6 - 7
apis/Lepao/AddAccount.js

@@ -12,9 +12,9 @@ class AddAccount extends API {
     }
     }
 
 
     async onRequest(req, res) {
     async onRequest(req, res) {
-        let { uuid, session, student_num, email, id, area, max_distance, min_distance } = req.body
+        let { uuid, session, student_num, email, id, area, max_distance, min_distance, auto_time } = req.body
 
 
-        if ([uuid, session, student_num, email].some(value => value === '' || value === null || value === undefined))
+        if ([uuid, session, student_num, email, auto_time].some(value => value === '' || value === null || value === undefined))
             return res.json({
             return res.json({
                 ...BaseStdResponse.MISSING_PARAMETER,
                 ...BaseStdResponse.MISSING_PARAMETER,
                 endpoint: 1513126
                 endpoint: 1513126
@@ -37,7 +37,6 @@ class AddAccount extends API {
                     return res.json({ ...BaseStdResponse.ERR, msg: '该乐跑账号已被其他用户绑定,请联系客服解绑' })
                     return res.json({ ...BaseStdResponse.ERR, msg: '该乐跑账号已被其他用户绑定,请联系客服解绑' })
                 return res.json({ ...BaseStdResponse.ERR, msg: '该乐跑账号已添加' })
                 return res.json({ ...BaseStdResponse.ERR, msg: '该乐跑账号已添加' })
             }
             }
-
         }
         }
 
 
         // 判断用户是否用了会员权益
         // 判断用户是否用了会员权益
@@ -68,11 +67,11 @@ class AddAccount extends API {
         let sql, r
         let sql, r
 
 
         if (!id) {
         if (!id) {
-            sql = 'INSERT INTO lepao_account (student_num, email, area, create_user, create_time) VALUES (?, ?, ?, ?, ?)'
-            r = await db.query(sql, [student_num, email, area, uuid, time])
+            sql = 'INSERT INTO lepao_account (student_num, email, area, auto_time, create_user, create_time) VALUES (?, ?, ?, ?, ?, ?)'
+            r = await db.query(sql, [student_num, email, area, auto_time, uuid, time])
         } else {
         } else {
-            sql = 'UPDATE lepao_account SET student_num = ?, email = ?, area = ?,  update_time = ? WHERE id = ?'
-            r = await db.query(sql, [student_num, email, area, time, id])
+            sql = 'UPDATE lepao_account SET student_num = ?, email = ?, area = ?, auto_time = ?, update_time = ? WHERE id = ?'
+            r = await db.query(sql, [student_num, email, area, auto_time, time, id])
         }
         }
 
 
         try {
         try {

+ 1 - 0
apis/Lepao/GetAccount.js

@@ -34,6 +34,7 @@ class GetAccount extends API {
                     a.update_time,
                     a.update_time,
                     a.state,
                     a.state,
                     a.area,
                     a.area,
+                    a.auto_time,
                     a.min_distance,
                     a.min_distance,
                     a.max_distance,
                     a.max_distance,
                     a.total_num,
                     a.total_num,

+ 1 - 1
lib/Lepao/Lepao.js

@@ -50,7 +50,7 @@ class Lepao {
             pathParams.push(area)
             pathParams.push(area)
         }
         }
 
 
-        pathSql += '  ORDER BY count LIMIT 1'
+        pathSql += '  ORDER BY count ASC LIMIT 1'
 
 
         const paths = await db.query(pathSql, pathParams)
         const paths = await db.query(pathSql, pathParams)
         if (!paths || paths.length === 0) {
         if (!paths || paths.length === 0) {