fe / yoho-blk · Commits

Go to a project

Authored by 郝肖肖
Commit c7019d3ba1b8a3c06c3a9fbd9b3915ae4f9c032d 2 parents 52f5ec3e 6fbd0864

解决冲突

Inline Side-by-side
Showing 2 changed files with 8 additions and 13 deletions
... ... @@ -56,8 +56,9 @@ const Alibank = {
notify(data, param) {
let payParams = JSON.parse(param.payParams);
let orderCode = parseInt(data.out_trade_no, 10);
let extraParam = JSON.parse(data.extra_common_param);
let bankName = payHelpersBank.getList()[extraParam.defaultbank].name || '';
let extraParam = data.extra_common_param && JSON.parse(data.extra_common_param) || {};
let bankName = payHelpersBank.getList()[extraParam.defaultbank] &&
payHelpersBank.getList()[extraParam.defaultbank].name || '';
logger.info(`Alibank notify, params = ${JSON.stringify(data)}`);
... ...
... ... @@ -22,23 +22,17 @@ module.exports = {
},
cookieDomain: 'yohoblk.com',
domains: {
// singleApi: 'http://single.yoho.cn/',
// api: 'http://api.yoho.yohoops.org/',
// service: 'http://service.yoho.yohoops.org/',
// search: 'http://search.yohoops.org/yohosearch/'
// api: 'http://api-test3.yohops.com:9999/',
// service: 'http://service-test3.yohops.com:9999/',
// singleApi: 'http://api-test3.yohops.com:9999/',
// liveApi: 'http://testapi.live.yohops.com:9999/',
// search: 'http://search.yohoops.org/yohosearch/'
favApi: 'http://192.168.102.31:8092/brower',
api: 'http://192.168.102.205:8080/gateway/',
service: 'http://192.168.102.205:8080/gateway/',
search: 'http://192.168.102.216:8080/yohosearch/'
// singleApi: 'http://single.yoho.cn/',
// api: 'http://api.yoho.yohoops.org/',
// service: 'http://service.yoho.yohoops.org/',
// search: 'http://search.yohoops.org/yohosearch/'
// singleApi: 'http://single.yoho.cn/',
// api: 'http://api-test3.yohops.com:9999/',
// service: 'http://service-test3.yohops.com:9999/',
// search: 'http://search.yohoops.org/yohosearch/'
... ...