订单详情

@@ -9,63 +9,33 @@
 const headerModel = require('../../../doraemon/models/header'); // 头部model
 const orderDetailModel = require('../models/orderDetail');
 
-exports.orderDetail = (req, res, next) => {
-    let params = {
-        uid: req.user.uid || 6228593
-    };
-
+let orderDetail = (req, res, next) => {
     let headerData = headerModel.setNav({
         navTitle: '订单详情'
     });
 
-    orderDetailModel.orderDetail(params).then(result => {
+    let responseData = {
+        module: 'home',
+        page: 'order-detail',
+        title: 'Yoho!Buy 有货',
+        pageHeader: headerData,
+        pageFooter: true
+    };
+
+    orderDetailModel.orderDetail({
+        uid: req.user.uid || 8039759, // TODO 待删除
+        order_code: req.query.order_code
+    }).then(result => {
         if (result) {
-            res.render('orderDetail', Object.assign(result, {
-                isLogin: params.uid ? true : false,
-                module: 'home',
-                page: 'order-detail',
-                title: 'Yoho!Buy 有货',
-                pageHeader: headerData,
-                pageFooter: true,
-                orderDetail: [
-                    {
-                        pay_expire: '2016-07-28 17:26:28',
-                        user_confirm_paid: 'N',
-                        payment_type_str: '在线支付',
-                        use_limit_code: 'Y',
-                        is_cancel: 'N',
-                        uid: '20000266',
-                        update_time: '0',
-                        name: '张三',
-                        phoneNum: '15999999999',
-                        isVirtual: false,
-                        mobile: '15999999999',
-                        orderNum: '1606688700',
-                        address: '测试地址测试地址测试地址测试地址',
-                        orderStatus: '已取消',
-                        orderTime: '2016-08-17 11:24:28',
-                        logisticsUrl: '#',
-                        logisticsCompany: '顺丰',
-                        logisticsNum: '111111',
-                        yohoCoin: '999',
-                        invoice: {
-                            title: '有货',
-                            contentValue: '有货',
-                            pdfUrl: '#'
-                        },
-                        qrcode: '#',
-                        orderBalance: [{
-                            promotion: '商品总金额',
-                            account: '100.00'
-                        }, {
-                            promotion: '运费',
-                            account: '10.00'
-                        }],
-                        price: '999.99'
-                    }
-                ]
-            }));
+            res.render('orderDetail', Object.assign(responseData,
+                {
+                    orderDetail: result
+                }));
         }
     }).catch(next);
 
 };
+
+module.exports = {
+    orderDetail
+};

@@ -7,10 +7,46 @@ const _ = require('lodash');
 const orderDetail = (params) => {
     let finalResult = {};
 
-
     return api.get('', _.assign({
-        method: 'app.SpaceOrders.closeReasons'
+        method: 'app.SpaceOrders.detail'
     }, params), {code: 200}).then((result) => {
+        Object.assign(finalResult, {
+            virtual_type: result.data.virtual_type,
+            phoneNum: result.data.mobile,
+            orderStatus: result.data.status_str,
+            orderNum: result.data.order_code,
+            orderTime: result.data.create_time,
+            isPay: result.data.payment_status === 'Y',
+            relation: result.data.relate_order_code === 'Y' ? 'true' : 'false',
+            name: result.data.user_name,
+
+            isVirtual: false,
+            mobile: '15999999999',
+            address: result.data.address,
+            logisticsUrl: '#',
+            logisticsCompany: '顺丰',
+            logisticsNum: '111111',
+            yohoCoin: result.data.yoho_give_coin,
+
+            invoice: [{
+                title: '有货',
+                contentValue: '有货',
+                pdfUrl: '#'
+            }, {
+                title: '有货',
+                contentValue: '有货',
+                pdfUrl: '#'
+            }],
+            orderBalance: [{
+                promotion: '商品总金额',
+                account: '100.00'
+            }, {
+                promotion: '运费',
+                account: '10.00'
+            }],
+            price: result.data.amount
+        });
+
 
         return finalResult;
     });