订单物流

@@ -52,6 +52,7 @@
                 </div>
                 {{/ progress}}
 
+                {{#if hastrace}}
                 {{# traceOrder}}
                 <div class="trace-order">
                     <p class="sub-title">
@@ -87,6 +88,7 @@
                     </div>
                 </div>
                 {{/ traceOrder}}
+                {{/if}}
 
                 {{# orderInfo}}
                 <div class="order-info">

@@ -190,6 +190,11 @@ class OrderModel
             $detail['traceOrder']['orderDate'] = date('Y.m.d H:i:s', $orderDetail['create_time']);
             $expressInfo = self::getExpressInfo($orderCode, $uid, $orderDetail['payment_type'], $orderDetail['create_time'], true);
             $detail['traceOrder']['logistics'] = $expressInfo['logistics']; //物流信息
+            if(empty($expressInfo['logistics'][0])){
+                $detail['hastrace']=false;
+            }else{
+                $detail['hastrace']=true;
+            }
             $detail['traceOrder']['logisticsCompany'] = $expressInfo['logisticsCompany'];
             $detail['traceOrder']['courierNumbe'] = $expressInfo['courierNumbe'];
             //虚拟商品
@@ -338,7 +343,7 @@ class OrderModel
         $result['courierNumbe'] = '';
         if ($paymetType == 1) {
             if ($isDetail) {
-                $result['logistics'][] = array(date('Y-m-d H:i:s', $createTime), ' ', '您的订单已提交，等待付款');
+                $result['logistics'][] = '';//array(date('Y-m-d H:i:s', $createTime), ' ', '您的订单已提交，等待付款');
             }
             else {
                 $result['logistics'][] = date('Y-m-d H:i:s', $createTime) . ' ' . '您的订单已提交，等待付款';
@@ -376,7 +381,7 @@ class OrderModel
                         }
                     }
                     //把最初的处理放最后
-                    //$result['logistics'][] = $logisticsTmp;
+                    $result['logistics'][] = $logisticsTmp;
                 }
             }
         }

@@ -131,6 +131,7 @@ class OrdersController extends WebAction
             if (isset($detail['noramlPayMode'])) {
                 $data['orderInfo'] = $detail['orderInfo'];
                 $data['traceOrder'] = $detail['traceOrder'];
+                $data['hastrace'] = $detail['hastrace'];
                 $data['noramlPayMode'] = $detail['noramlPayMode'];
             }
             else if (isset($detail['virtualPayMode'])) {

@@ -21,8 +21,8 @@ define('USE_INTER_FACE_SHUNT', false);//分流开关
 //define('API_OLD', 'http://test2.open.yohobuy.com/');
 
 #dev环境
- define('API_URL', 'http://api-test1.yohops.com:9999');
- define('SERVICE_URL', 'http://service-test1.yohops.com:9999/');
+ define('API_URL', 'http://api-test3.yohops.com:9999');
+ define('SERVICE_URL', 'http://service-test3.yohops.com:9999/');
  define('YOHOBUY_URL', 'http://www.yohobuy.com/');
  define('SERVICE_NOTIFY', 'http://test2.open.yohobuy.com/');
  define('API_OLD', 'http://devservice.yoho.cn:58077/');