YH-4978

@@ -41,17 +41,26 @@ exports.ensure = (req, res, next) => {
 
         // 获取结算 数据
         let paymentInfo = yield buyNowModel.payment(paymentOption, orderInfo);
+        let view;
 
         if (paymentInfo.code !== 200) {
-            return Promise.reject('结算请求失败');
+            if (paymentInfo.message) {
+                view = {
+                    orderEnsure: false,
+                    message: paymentInfo.message
+                };
+            } else {
+                return Promise.reject(paymentInfo);
+            }
+        } else {
+            // 渲染
+            view = Object.assign({
+                seckill: skillData,
+                orderEnsure: true,
+                sku,
+            }, paymentInfo.data);
         }
 
-        // 渲染
-        let view = Object.assign({
-            seckill: skillData,
-            orderEnsure: true,
-            sku,
-        }, paymentInfo.data);
 
         // console.log(view);
         res.locals.title = '确认订单';

 <div class="order-ensure-page yoho-page">
-    {{# orderEnsure}}
+    {{#if orderEnsure}}
     {{#if addressInfo}}
     <div class="address block address-wrap {{#if pageHeader.boys}} boys{{/if}}{{#if pageHeader.girls}} girls{{/if}}{{#if pageHeader.kids}} kids{{/if}}{{#if pageHeader.lifeStyle}} life-style{{/if}}" data-id ="{{addressId}}">
         <div class="info">
@@ -193,5 +193,7 @@
     {{#with seckill}}
         <input type="hidden" id="activity-id" name="activity-id" value="{{activityId}}">
     {{/with}}
-    {{/ orderEnsure}}
+    {{else}}
+        {{message}}
+    {{/if}}
 </div>

@@ -115,10 +115,11 @@ const _getOrderData = (params) => {
 const _getOrderStatus = (order, showLogistics) => {
     let result = {};
 
+    result.useLimitCode = order.use_limit_code === 'Y';
     if (order.is_cancel === 'Y') {
-        return {
+        return Object.assign(result, {
             canceled: true
-        };
+        });
     }
 
     // 先判断订单付款方式，根据不同的付款方式计算订单状态。（注:货到付款没有待付款状态）
@@ -294,6 +295,7 @@ const getOrders = (params) => {
 
                 /* 订单件数清零 */
                 count = 0;
+
                 let perOrder = _getOrderStatus(value);
 
                 /* 是否是虚拟商品 */

@@ -167,6 +167,7 @@ const orderDetailData = (uid, orderCode) => {
             let status = _getOrderStatus(orderDetail);
 
             orderDetail = _.assign(orderDetail, status);
+            orderDetail.useLimitCode = orderDetail.useLimitCode === 'Y';
 
             if (orderDetail.virtualType && orderDetail.virtualType === 3) {
                 orderDetail = _.assign(orderDetail, {

@@ -111,7 +111,7 @@
                     {{#if isVirtual}}
                         <!--虚拟商品-->
                     {{else}}
-                        <span class="btn btn-rebuy">再次购买</span>
+                        {{#unless useLimitCode}}<span class="btn btn-rebuy">再次购买</span>{{/unless}}
                     {{/if}}
                 {{/unless}}
             {{/unless}}

@@ -23,7 +23,7 @@
                     {{#if isVirtual}}
                         <!--虚拟商品-->
                     {{else}}
-                        <span class="btn rebuy">再次购买</span>
+                        {{#unless useLimitCode}}<span class="btn rebuy">再次购买</span>{{/unless}}
                     {{/if}}
             {{/unless}}
 

@@ -24,7 +24,7 @@
                     {{#if isVirtual}}
                         <!--虚拟商品-->
                     {{else}}
-                        <span class="btn rebuy">再次购买</span>
+                        {{#unless useLimitCode}}<span class="btn rebuy">再次购买</span>{{/unless}}
                     {{/if}}
                 {{/unless}}