logistic

@@ -51,7 +51,7 @@ exports.orderEnsure = (req, res, next) => {
         headerData.backUrl = returnUrl;
         headerData.backUrl = returnUrl;
     }
     }
 
 
-    let orderPromise = cartModel.cartPay(uid, cartType, orderInfo, sku, skn, buyNumber);
+    let orderPromise;
     let userProfilePromise = userModel.queryProfile(uid);
     let userProfilePromise = userModel.queryProfile(uid);
     let addressPromise = addressModel.addressData(uid);
     let addressPromise = addressModel.addressData(uid);
 
 
@@ -59,6 +59,8 @@ exports.orderEnsure = (req, res, next) => {
         let activityInfo = JSON.parse(req.cookies['activity-info']);
         let activityInfo = JSON.parse(req.cookies['activity-info']);
 
 
         orderPromise = cartModel.cartPay(uid, cartType, orderInfo, sku, skn, buyNumber, activityInfo);
         orderPromise = cartModel.cartPay(uid, cartType, orderInfo, sku, skn, buyNumber, activityInfo);
+    } else {
+        orderPromise = cartModel.cartPay(uid, cartType, orderInfo, sku, skn, buyNumber);
     }
     }
 
 
     return Promise.all([orderPromise, userProfilePromise, addressPromise]).then(result => {
     return Promise.all([orderPromise, userProfilePromise, addressPromise]).then(result => {

@@ -70,9 +70,27 @@ const cancelOrder = (req, res, next) => {
     }).catch(next);
     }).catch(next);
 };
 };
 
 
+/**
+ * 我的订单-查看物流信息
+ */
+const logistic = (req, res, next) => {
+    orderDetailModel.logistics(req.query.order_code, req.user.uid).then(result => {
+        res.render('logistic', _.assign(result, {
+            pageHeader: headerModel.setNav({
+                navTitle: '订单详情',
+                navBtn: false
+            }),
+            module: 'home',
+            page: 'logistic',
+            logisticInfoPage: true
+        }));
+    }).catch(next);
+};
+
 module.exports = {
 module.exports = {
     orderDetailData,
     orderDetailData,
     delOrder,
     delOrder,
     readdData,
     readdData,
-    cancelOrder
+    cancelOrder,
+    logistic
 };
 };

@@ -2,6 +2,7 @@
 
 
 
 
 const api = global.yoho.API;
 const api = global.yoho.API;
+const serviceApi = global.yoho.ServiceAPI;
 
 
 const _ = require('lodash');
 const _ = require('lodash');
 
 
@@ -10,6 +11,8 @@ const helpers = global.yoho.helpers;
 const camelCase = global.yoho.camelCase;
 const camelCase = global.yoho.camelCase;
 const logger = global.yoho.logger;
 const logger = global.yoho.logger;
 
 
+const CODE_LOGISTIC_BANNER = '1fc9b2484fcd559049f2f7e0db313f20'; // 物流详情banner资源码
+
 const closeReasons = () => {
 const closeReasons = () => {
     return api.get('', {
     return api.get('', {
         method: 'app.SpaceOrders.closeReasons'
         method: 'app.SpaceOrders.closeReasons'
@@ -370,10 +373,84 @@ const cancelOrder = (orderCode, uid, reasonId, gender, channel, reason) => {
     });
     });
 };
 };
 
 
+/*
+* 我的订单-查看物流
+* @param int $orderCode 订单号
+* @param int $uid 用户ID
+* @return array
+*/
+const _logisticsData = (orderCode, uid) => {
+    return api.get('', {
+        method: 'app.express.li',
+        order_code: orderCode,
+        uid: uid
+    });
+};
+
+/**
+ * 获取物流详情页banner
+ */
+const _getLogisterBanner = () => {
+    return serviceApi.get('operations/api/v5/resource/get', {
+        content_code: CODE_LOGISTIC_BANNER
+    }, {code: 200});
+};
+
+/**
+ * 查看物流
+ *
+ * @param int orderCode 订单编号
+ * @param int uid 用户ID
+ * @return array
+ */
+const logistics = (orderCode, uid) => {
+    return Promise.all([
+        _getLogisterBanner(),
+        _logisticsData(orderCode, uid),
+    ]).then(result => {
+        let finalResult = {
+            banner: []
+        };
+        let banners = result[0];
+        let logistic = result[1];
+
+        // 获取物流详情页banner
+        if (banners && banners.data) {
+            _.forEach(banners.data, value => {
+                _.forEach(value.data, subValue => {
+                    finalResult.banner.push({
+                        url: subValue.url,
+                        img: subValue.src
+                    });
+                });
+            });
+        }
+
+        if (logistic && logistic.data) {
+            finalResult.logisticUrl = _.get(logistic, 'data.url', '');
+            finalResult.logisticImg = _.get(logistic, 'data.logo', '');
+            finalResult.logisticCompany = _.get(logistic, 'data.caption', '');
+            finalResult.logisticNumber = _.get(logistic, 'data.express_number', '');
+            finalResult.logisticDetail = [];
+
+            _.forEach(_.get(logistic, 'data.express_detail', []), value => {
+                finalResult.logisticDetail.push({
+                    status: value.accept_address,
+                    date: value.acceptTime,
+                });
+            });
+
+        }
+
+        return finalResult;
+    });
+};
+
 module.exports = {
 module.exports = {
     orderDetailData,
     orderDetailData,
     closeReasons,
     closeReasons,
     delOrder,
     delOrder,
     readdData,
     readdData,
-    cancelOrder
+    cancelOrder,
+    logistics
 };
 };

@@ -134,4 +134,6 @@ router.get('/installment/setMasterCard', installment.setMasterCard); // 銝
 
 
 router.get('/getaddress.json', addressController.newGetAddress); // TODO 模拟省数据
 router.get('/getaddress.json', addressController.newGetAddress); // TODO 模拟省数据
 
 
+router.get('/logistic', auth, orderDetailController.logistic); // 查看物流页面
+
 module.exports = router;
 module.exports = router;

+<div class="logistic-page yoho-page">
+	<div class="overview">
+		<div class="left" >
+			<a href="{{logisticUrl}}"><img class="icon" src="{{logisticImg}}" /></a>
+		</div>
+		<div class="right">
+			<div>
+				<span class='info'>物流公司:</span>
+				<span >{{logisticCompany}}</span>
+			</div>
+			<div>
+				<span class='info'>快递单号:</span>
+				<span>{{logisticNumber}}</span>
+			</div>
+		</div>
+		
+	</div>
+	
+	<div class="title">
+		<span>物流详情</span>
+	</div>
+	
+	<div class="detail">
+		{{# logisticDetail}}
+		<div class="timeline-box ">
+			<span class="timeline-node"></span>
+			<div class="timeline-info">
+				<div class="timeline-info-row">
+					{{status}}
+				</div>
+				<div class="timeline-info-row">
+					{{date}}
+				</div>
+			</div>
+		</div>
+		{{/ logisticDetail}}
+	</div>
+
+	<div class="banner">
+		{{#banner}}
+		<a href="{{url}}">
+			<img src="{{image2 img w=640 h=200}}" alt="img">
+		</a>
+		{{/banner}}
+	</div>
+
+	{{#unless @root.wap.ucenter.removePrefer}}
+            {{> common/recommend-for-you}}
+    {{/unless}}
+</div>

+/**
+ * 物流信息页面
+ * @author: 赵彪<bill.zhao@yoho.cn>
+ * @date: 2015/12/02
+ */
+
+var $ = require('yoho-jquery');
+
+var $footer = $('#yoho-footer'),
+    winH = window.outerHeight,
+    bodyH = document.body.offsetHeight,
+    footH = $footer.height();
+
+require('../common');
+function addFooterTopBorder() {
+    if (footH + bodyH > winH) {
+        window.rePosFooter();
+    } else {
+        $footer.css('border-top', '1px solid #f1f1f1');
+    }
+}
+
+$(document).ready(addFooterTopBorder);
+
+require('./recommend-for-you-user-center');
+
+// 提前触发lazyload
+$(window).scrollTop(1).scrollTop(0);