Browse Source

增加对用户名称的提取

Pchen. 11 months ago
parent
commit
68ba065481
2 changed files with 24 additions and 15 deletions
  1. 24 12
      apis/Lepao/UpdateAccount.js
  2. 0 3
      apis/Order/CallBack.js

+ 24 - 12
apis/Lepao/UpdateAccount.js

@@ -15,9 +15,9 @@ class UpdateAccount extends API {
     }
     }
 
 
     async onRequest(req, res) {
     async onRequest(req, res) {
-        let { data } = req.body
+        let { reqData, resData } = req.body
 
 
-        if ([data].some(value => value === '' || value === null || value === undefined))
+        if ([reqData, resData].some(value => value === '' || value === null || value === undefined))
             return res.json({
             return res.json({
                 ...BaseStdResponse.MISSING_PARAMETER,
                 ...BaseStdResponse.MISSING_PARAMETER,
                 endpoint: 1513126
                 endpoint: 1513126
@@ -25,8 +25,8 @@ class UpdateAccount extends API {
 
 
         try {
         try {
             const endpoint = config.runpy + '/decrypted_data'
             const endpoint = config.runpy + '/decrypted_data'
-            const resData = await axios.post(endpoint, { data })
-            const userData = resData.data
+            const ReqData = await axios.post(endpoint, { reqData })
+            let userData = ReqData.data
             if (userData?.code !== 200 || !userData.data)
             if (userData?.code !== 200 || !userData.data)
                 return res.json({
                 return res.json({
                     ...BaseStdResponse.ERR,
                     ...BaseStdResponse.ERR,
@@ -39,26 +39,35 @@ class UpdateAccount extends API {
                     msg: '未提取出用户登录信息,请重试'
                     msg: '未提取出用户登录信息,请重试'
                 })
                 })
 
 
-            let findSql = 'SELECT email, name FROM lepao_account WHERE student_num = ?'
+            const ResData = await axios.post(endpoint, { resData })
+            userData = ResData.data
+            const { name } = userData
+            if ([name].some(value => value === '' || value === null || value === undefined))
+                return res.json({
+                    ...BaseStdResponse.ERR,
+                    msg: '未提取出用户登录信息,请重试'
+                })
+
+            let findSql = 'SELECT email, create_user FROM lepao_account WHERE student_num = ?'
             let findRows = await db.query(findSql, [student_num])
             let findRows = await db.query(findSql, [student_num])
             if (!findRows)
             if (!findRows)
                 return res.json({
                 return res.json({
                     ...BaseStdResponse.ERR,
                     ...BaseStdResponse.ERR,
                     msg: '无法解析用户数据,请重试'
                     msg: '无法解析用户数据,请重试'
                 })
                 })
-            if(findRows.length === 0)
+            if (findRows.length === 0)
                 return res.json({
                 return res.json({
                     ...BaseStdResponse.ERR,
                     ...BaseStdResponse.ERR,
                     msg: '该乐跑账号尚未在RunForge系统中添加,请先前往 https://lepao.ctbu.top/ 添加你的账户'
                     msg: '该乐跑账号尚未在RunForge系统中添加,请先前往 https://lepao.ctbu.top/ 添加你的账户'
                 })
                 })
-            let updateSql = 'UPDATE lepao_account SET uid = ?, token = ?, school_id = ?, state = 1 WHERE student_num = ?'
-            let updateRows = await db.query(updateSql, [uid, token, school_id, student_num])
+            let updateSql = 'UPDATE lepao_account SET uid = ?, token = ?, school_id = ?, name = ?, state = 1 WHERE student_num = ?'
+            let updateRows = await db.query(updateSql, [uid, token, school_id, name, student_num])
 
 
-            if(updateRows && updateRows.affectedRows > 0) {
+            if (updateRows && updateRows.affectedRows > 0) {
                 res.json({
                 res.json({
                     ...BaseStdResponse.OK,
                     ...BaseStdResponse.OK,
                     data: {
                     data: {
-                        name: findRows[0].name,
+                        name,
                         account: student_num
                         account: student_num
                     }
                     }
                 })
                 })
@@ -66,11 +75,14 @@ class UpdateAccount extends API {
                     name: findRows[0].name,
                     name: findRows[0].name,
                     account: student_num
                     account: student_num
                 }
                 }
-                
+
                 await EmailTemplate.updateSuccess(findRows[0].email, emailData)
                 await EmailTemplate.updateSuccess(findRows[0].email, emailData)
             }
             }
         } catch (error) {
         } catch (error) {
-
+            return res.json({
+                ...BaseStdResponse.ERR,
+                msg: '更新用户信息失败,请重试'
+            })
         }
         }
     }
     }
 }
 }

+ 0 - 3
apis/Order/CallBack.js

@@ -14,9 +14,6 @@ class CallBack extends API {
     }
     }
 
 
     async onRequest(req, res) {
     async onRequest(req, res) {
-
-
-
         // 签名校验
         // 签名校验
         const rawParams = {
         const rawParams = {
             money, name, out_trade_no, pid, trade_no, trade_status, type
             money, name, out_trade_no, pid, trade_no, trade_status, type