|
@@ -10,6 +10,7 @@ const config = global.yoho.config; |
|
@@ -10,6 +10,7 @@ const config = global.yoho.config; |
|
10
|
const helpers = global.yoho.helpers;
|
10
|
const helpers = global.yoho.helpers;
|
|
11
|
const sign = require('./sign');
|
11
|
const sign = require('./sign');
|
|
12
|
const md5 = require('md5');
|
12
|
const md5 = require('md5');
|
|
|
|
13
|
+const moment = require('moment');
|
|
13
|
const logger = global.yoho.logger;
|
14
|
const logger = global.yoho.logger;
|
|
14
|
const AlipayConfig = config.alipayConfig;
|
15
|
const AlipayConfig = config.alipayConfig;
|
|
15
|
|
16
|
|
|
@@ -20,11 +21,11 @@ const Alipay = { |
|
@@ -20,11 +21,11 @@ const Alipay = { |
|
20
|
service: AlipayConfig.service,
|
21
|
service: AlipayConfig.service,
|
|
21
|
partner: AlipayConfig.partner,
|
22
|
partner: AlipayConfig.partner,
|
|
22
|
_input_charset: AlipayConfig.inputCharset,
|
23
|
_input_charset: AlipayConfig.inputCharset,
|
|
23
|
- notify_url: config.domains.service + 'payment/alipay_notify',
|
24
|
+ notify_url: AlipayConfig.notifyUrl,
|
|
24
|
return_url: protocol + ':' + helpers.urlFormat(AlipayConfig.returnUrl),
|
25
|
return_url: protocol + ':' + helpers.urlFormat(AlipayConfig.returnUrl),
|
|
25
|
subject: '有货订单号:' + order.order_code,
|
26
|
subject: '有货订单号:' + order.order_code,
|
|
26
|
out_trade_no: order.order_code,
|
27
|
out_trade_no: order.order_code,
|
|
27
|
- it_b_pay: order.pay_expire,
|
28
|
+ it_b_pay: moment(order.pay_expire).format('YYYY-MM-DD HH:mm'),
|
|
28
|
total_fee: parseFloat(order.payment_amount),
|
29
|
total_fee: parseFloat(order.payment_amount),
|
|
29
|
seller_id: AlipayConfig.partner,
|
30
|
seller_id: AlipayConfig.partner,
|
|
30
|
payment_type: '1',
|
31
|
payment_type: '1',
|
