Authored by 郝肖肖

Merge branch 'feature/wechat-pay' into release/2.0

... ... @@ -56,7 +56,7 @@ const Alibank = {
let orderCode = parseInt(outTradeNos[0], 10);
let bankName = outTradeNos[1] && payHelpersBank.getList()[outTradeNos[1]].name || '';
logger.info(`Alipay notify, params = ${JSON.stringify(data)}`);
logger.info(`Alibank notify, params = ${JSON.stringify(data)}`);
if (!this.checkNotify(data, payParams)) {
return {payResult: -1, bankName: bankName};
... ...
... ... @@ -73,6 +73,8 @@ const Payment = {
}
}
logger.info(`pay to url, params = ${JSON.stringify(result)}`);
if (result.code === 200) {
let updateInfo = yield Payment.beforePay(user, order, method, bankCode);
... ... @@ -133,6 +135,14 @@ const Payment = {
payResult.bankName = payName = payResult.bankName || payInfo.payName || '';
payResult.bankCode = payResult.bankCode || payInfo.pay_code || '';
//记录日志
logger.info(`\r\n\r\n pay back confirmreq = ${JSON.stringify({
query: query,
payId: payId,
user: user,
payResult: payResult
})}`);
if (payResult && payResult.payResult === 200) {
if (payResult.orderCode) {
logger.info('pay back confirm');
... ...
... ... @@ -103,7 +103,7 @@ module.exports = {
}
},
pay: {
serviceNotify: 'http://devservice.yoho.cn:58077/'
serviceNotify: 'http://service-test3.yohops.com:9999/'
},
crypto: {
common: 'yohoblk9646abcde'
... ... @@ -159,6 +159,9 @@ if (isProduction) {
session: ['127.0.0.1:12111'],
timeout: 1000,
retries: 0
},
pay: {
serviceNotify: 'http://service-test3.yohops.com:9999/'
}
});
}
... ...