From 18df4ea7fae30bca0180389a1922516566a0f8e3 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 23 Aug 2019 10:33:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E7=BD=91=E5=89=8D=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/models/Order_model.php | 13 ++++++++++---
 application/views/order/detail.php | 10 ++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/application/models/Order_model.php b/application/models/Order_model.php
index 74780e95..1509f725 100644
--- a/application/models/Order_model.php
+++ b/application/models/Order_model.php
@@ -9,10 +9,17 @@ class Order_model extends CI_Model {
     public function get_order_by_id($order_id) {
         // [syn123].tourmanager.dbo.
         $order_query = $this->hunter->query("select COLI_Name, COLI_OrderDetailText, COLI_OrderStartDate
-            from ConfirmLineInfoTmp
+            from [syn123].tourmanager.dbo.ConfirmLineInfoTmp
             where
                 COLI_ID = ?", $order_id);
         $order_array = $order_query->row_array();
+        if (empty($order_array)) {
+            $order_array = [
+                'COLI_Name' => '无法查到该订单',
+                'COLI_OrderDetailText' => '请检查订单号是否正确',
+                'COLI_OrderStartDate' => 'NULL'
+            ];
+        }
         return $order_array;
     }
 
@@ -26,8 +33,8 @@ class Order_model extends CI_Model {
         
         if (empty($order_array)) {
             $order_array = [
-                'COLI_Name' => 'NULL',
-                'COLI_OrderDetailText' => 'NULL',
+                'COLI_Name' => '无法查到该订单',
+                'COLI_OrderDetailText' => '订单可能没有同步回来',
                 'COLI_OrderStartDate' => 'NULL'
             ];
         }
diff --git a/application/views/order/detail.php b/application/views/order/detail.php
index 9148ad46..28ede0e7 100644
--- a/application/views/order/detail.php
+++ b/application/views/order/detail.php
@@ -16,12 +16,11 @@
 </form>
 <br>
 <div class="panel panel-success">
-  <div class="panel-heading">网前</div>
+  <div class="panel-heading">网前订单情况</div>
   <div class="panel-body">
     <table class="table">
-      <caption>已经入库成功</caption>
       <thead>
-        <tr> <th>COLI_Name</th> <th>COLI_OrderDetailText</th>
+        <tr> <th style='width: 12%'>订单号</th> <th>订单信息</th>
         </tr>
       </thead>
       <tbody>
@@ -35,12 +34,11 @@
 </div>
 
 <div class="panel panel-info">
-  <div class="panel-heading">HT</div>
+  <div class="panel-heading">HT 订单情况</div>
   <div class="panel-body">
     <table class="table">
-      <caption>可以在HT查询</caption>
       <thead>
-        <tr> <th>COLI_Name</th> <th>COLI_OrderDetailText</th>
+        <tr> <th style='width: 12%'>订单号</th> <th>订单信息</th>
         </tr>
       </thead>
       <tbody>