diff --git a/src/controllers/alchemy.controller.ts b/src/controllers/alchemy.controller.ts index ee44972..b40f10b 100644 --- a/src/controllers/alchemy.controller.ts +++ b/src/controllers/alchemy.controller.ts @@ -12,9 +12,9 @@ class AlchemyController extends BaseController { async beginPay(req, res) { const user = req.user const { chain, currency, address } = req.params - const tokenResult = await refreshToken(user.emailReal) + const tokenResult = await refreshToken(user.emailReal || user.email) console.log(tokenResult) - if (!tokenResult.success) { + if (!tokenResult.success || tokenResult.returnCode !== '0000') { logger.info(`fetch pay token error::code: ${tokenResult.returnCode} msg: ${tokenResult.returnMsg}`) throw new ZError(10, 'fetch pay token error') } diff --git a/src/logger/logger.ts b/src/logger/logger.ts index 6051b1b..8bbf745 100644 --- a/src/logger/logger.ts +++ b/src/logger/logger.ts @@ -1,2 +1,3 @@ -const logger = require('tracer').colorConsole({ dateformat: 'yyyy-mm-dd HH:MM:ss.L' }) +const level = process.env.NODE_ENV === 'production' ? 'info' : 'log' +const logger = require('tracer').colorConsole({ dateformat: 'yyyy-mm-dd HH:MM:ss.L', level }) export default logger diff --git a/src/service/alchemy.svr.ts b/src/service/alchemy.svr.ts index 3899e1a..b3f46fa 100644 --- a/src/service/alchemy.svr.ts +++ b/src/service/alchemy.svr.ts @@ -73,13 +73,14 @@ export async function refreshToken(email: string) { return response.data } -export async function createOrder(data: any) { +export async function createOrder(token: string, data: any) { const { appid, timestamp, sign } = createSimpleSign() const host = process.env.ALCHEMY_API_BASE const config = { method: 'post', - url: `${host}/merchant/getToken`, + url: `${host}/merchant/trade/create`, headers: { + 'access-token': token, appId: appid, timestamp: timestamp, sign: sign,