Authored by 郝肖肖

支付宝同步地址,remove camelcase

... ... @@ -181,28 +181,30 @@ const callback = (req, res, next) => {
PayHelpers.afterPay(query, payId, req.user).then(result => {
if (result.code === 200 && result.data && result.data.order) {
let order = result.data.order;
let promotion = order.promotionFormulas;
let promotion = order.promotion_formulas;
let coin = 0;
_.forEach(promotion, p => {
if (p.promotion === 'YOHO币') {
coin = parseInt(parseFloat(p.promotionAmount.substring(2, p.promotionAmount.length)) * 100, 10);
coin = parseInt(parseFloat(p.promotion_amount.substring(2, p.promotion_amount.length)) * 100, 10);
}
});
res.display('pay-success', {
defaultHeader: false,
content: {
cost: order.paymentAmount,
orderNum: order.orderCode,
cost: order.payment_amount,
orderNum: order.order_code,
coin: coin,
orderHref: helpers.urlFormat('/me/order/detail', {
orderCode: order.orderCode
orderCode: order.order_code
}),
walkHref: helpers.urlFormat('/')
}
});
} else {
return next();
}
}).catch(next);
};
... ...
... ... @@ -10,8 +10,8 @@ const Sign = {
let keys = Object.keys(args);
keys = keys.filter(k => {
return args[k] === '' || args[k] === "undefined" ? false : true;
}).sort();
return args[k] === '' || args[k] === 'undefined' ? false : true;
}).sort();
return keys.map(k => {
return k + '=' + args[k];
... ... @@ -22,8 +22,8 @@ const Sign = {
let keys = Object.keys(args);
keys = keys.filter(k => {
return args[k] === '' || args[k] === "undefined" ? false : true;
}).sort();
return args[k] === '' || args[k] === 'undefined' ? false : true;
}).sort();
return keys.map(k => {
return k.toLowerCase() + '=' + encodeURIComponent(args[k]);
... ...
... ... @@ -65,7 +65,7 @@ const Payment = {
break;
case PayData.payments.alibank:
bankCode = paymentPars[1];
payInfo.bankCode = bankCode;//设置默认银行
payInfo.bankCode = bankCode;// 设置默认银行
result = Alibank.pay(user, order, payInfo);
break;
default:
... ...
... ... @@ -224,8 +224,8 @@ const procOrderData = (payResult, uid) => {
let orderInfo = yield OrderData.orderDetail(uid, orderCode);
if (orderInfo && orderInfo.data) {
let order = camelCase(orderInfo.data);
let amount = order.paymentAmount;
let order = orderInfo.data;
let amount = order.payment_amount;
if (order.is_cancel === 'Y') {
logger.warn('front pay success but order is cancel.', {payResult: payResult, order: order});
... ...