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 = { @@ -56,8 +56,9 @@ const Alibank = {
56 notify(data, param) { 56 notify(data, param) {
57 let payParams = JSON.parse(param.payParams); 57 let payParams = JSON.parse(param.payParams);
58 let orderCode = parseInt(data.out_trade_no, 10); 58 let orderCode = parseInt(data.out_trade_no, 10);
59 - let extraParam = JSON.parse(data.extra_common_param);  
60 - let bankName = payHelpersBank.getList()[extraParam.defaultbank].name || ''; 59 + let extraParam = data.extra_common_param && JSON.parse(data.extra_common_param) || {};
  60 + let bankName = payHelpersBank.getList()[extraParam.defaultbank] &&
  61 + payHelpersBank.getList()[extraParam.defaultbank].name || '';
61 62
62 logger.info(`Alibank notify, params = ${JSON.stringify(data)}`); 63 logger.info(`Alibank notify, params = ${JSON.stringify(data)}`);
63 64
@@ -22,23 +22,17 @@ module.exports = { @@ -22,23 +22,17 @@ module.exports = {
22 }, 22 },
23 cookieDomain: 'yohoblk.com', 23 cookieDomain: 'yohoblk.com',
24 domains: { 24 domains: {
25 - // singleApi: 'http://single.yoho.cn/',  
26 - // api: 'http://api.yoho.yohoops.org/',  
27 - // service: 'http://service.yoho.yohoops.org/',  
28 - // search: 'http://search.yohoops.org/yohosearch/'  
29 -  
30 - // api: 'http://api-test3.yohops.com:9999/',  
31 - // service: 'http://service-test3.yohops.com:9999/',  
32 - // singleApi: 'http://api-test3.yohops.com:9999/',  
33 - // liveApi: 'http://testapi.live.yohops.com:9999/',  
34 - // search: 'http://search.yohoops.org/yohosearch/'  
35 -  
36 favApi: 'http://192.168.102.31:8092/brower', 25 favApi: 'http://192.168.102.31:8092/brower',
37 api: 'http://192.168.102.205:8080/gateway/', 26 api: 'http://192.168.102.205:8080/gateway/',
38 service: 'http://192.168.102.205:8080/gateway/', 27 service: 'http://192.168.102.205:8080/gateway/',
39 search: 'http://192.168.102.216:8080/yohosearch/' 28 search: 'http://192.168.102.216:8080/yohosearch/'
40 29
41 // singleApi: 'http://single.yoho.cn/', 30 // singleApi: 'http://single.yoho.cn/',
  31 + // api: 'http://api.yoho.yohoops.org/',
  32 + // service: 'http://service.yoho.yohoops.org/',
  33 + // search: 'http://search.yohoops.org/yohosearch/'
  34 +
  35 + // singleApi: 'http://single.yoho.cn/',
42 // api: 'http://api-test3.yohops.com:9999/', 36 // api: 'http://api-test3.yohops.com:9999/',
43 // service: 'http://service-test3.yohops.com:9999/', 37 // service: 'http://service-test3.yohops.com:9999/',
44 // search: 'http://search.yohoops.org/yohosearch/' 38 // search: 'http://search.yohoops.org/yohosearch/'