Showing
1 changed file
with
34 additions
and
2 deletions
@@ -22,9 +22,41 @@ exports.orderDetailData = (req, res, next) => { | @@ -22,9 +22,41 @@ exports.orderDetailData = (req, res, next) => { | ||
22 | 22 | ||
23 | if (req.query.openId) { | 23 | if (req.query.openId) { |
24 | // 微信支付成功,发送支付确认接口 | 24 | // 微信支付成功,发送支付确认接口 |
25 | - req.ctx(payModel).sendPayConfirm(orderCode, 22, uid); | 25 | + req.ctx(payModel).sendPayConfirm(orderCode, 22, uid).then(() => { |
26 | + Promise.all([ | ||
27 | + req.ctx(orderDetailModel).orderDetailData(uid, orderCode), | ||
28 | + req.ctx(orderDetailModel).closeReasons(), | ||
29 | + req.ctx(orderModel).refundReason() | ||
30 | + ]).then(result => { | ||
31 | + let orderDetail = result[0]; | ||
32 | + let cancelReason = result[1]; | ||
33 | + let refundReason = result[2]; | ||
34 | + | ||
35 | + if (!orderDetail || _.isEmpty(orderDetail)) { | ||
36 | + return next(); | ||
26 | } | 37 | } |
27 | 38 | ||
39 | + Object.assign(orderDetail, { | ||
40 | + cancelReason: cancelReason | ||
41 | + }); | ||
42 | + | ||
43 | + orderDetail.serviceUrl = serviceUrl; | ||
44 | + res.render('orderDetail', { | ||
45 | + module: 'home', | ||
46 | + page: 'orderdetail', | ||
47 | + pageHeader: headerModel.setNav({ | ||
48 | + navTitle: '订单详情' | ||
49 | + }), | ||
50 | + title: '订单详情', | ||
51 | + pageFooter: true, | ||
52 | + orderDetail: orderDetail, | ||
53 | + refundReason: refundReason, | ||
54 | + width750: true, | ||
55 | + localCss: true, | ||
56 | + }); | ||
57 | + }).catch(next); | ||
58 | + }); | ||
59 | + } else { | ||
28 | Promise.all([ | 60 | Promise.all([ |
29 | req.ctx(orderDetailModel).orderDetailData(uid, orderCode), | 61 | req.ctx(orderDetailModel).orderDetailData(uid, orderCode), |
30 | req.ctx(orderDetailModel).closeReasons(), | 62 | req.ctx(orderDetailModel).closeReasons(), |
@@ -57,7 +89,7 @@ exports.orderDetailData = (req, res, next) => { | @@ -57,7 +89,7 @@ exports.orderDetailData = (req, res, next) => { | ||
57 | localCss: true, | 89 | localCss: true, |
58 | }); | 90 | }); |
59 | }).catch(next); | 91 | }).catch(next); |
60 | - | 92 | + } |
61 | }; | 93 | }; |
62 | 94 | ||
63 | // 删除订单 | 95 | // 删除订单 |
-
Please register or login to post a comment