Merge branch 'feature/balanceSwitch' into release/5.4.1
Showing
1 changed file
with
6 additions
and
0 deletions
@@ -18,6 +18,7 @@ const Payment = require('../helpers/payment'); | @@ -18,6 +18,7 @@ const Payment = require('../helpers/payment'); | ||
18 | const WxPay = require('../helpers/pay/wechat'); | 18 | const WxPay = require('../helpers/pay/wechat'); |
19 | const common = require('../helpers/pay/common'); | 19 | const common = require('../helpers/pay/common'); |
20 | const logger = global.yoho.logger; | 20 | const logger = global.yoho.logger; |
21 | +const _ = require('lodash'); | ||
21 | 22 | ||
22 | /** | 23 | /** |
23 | * 支付中心 | 24 | * 支付中心 |
@@ -37,6 +38,11 @@ const payCenter = (req, res, next) => { | @@ -37,6 +38,11 @@ const payCenter = (req, res, next) => { | ||
37 | res.redirect('/'); | 38 | res.redirect('/'); |
38 | } | 39 | } |
39 | 40 | ||
41 | + // 如果支付开关关闭,走老版本的支付 | ||
42 | + if (_.get(req.app.locals.wap, 'pay.newPay', false) === false) { | ||
43 | + return res.redirect(302, helpers.urlFormat('/home/orders/pay', {order_code: orderCode})); | ||
44 | + } | ||
45 | + | ||
40 | if (sessionKey) { | 46 | if (sessionKey) { |
41 | sessionKey = sessionKey.substr(0, sessionKey.length - 8); | 47 | sessionKey = sessionKey.substr(0, sessionKey.length - 8); |
42 | } else { | 48 | } else { |
-
Please register or login to post a comment