Merge branch 'master' of http://gogs.hnwmzp.cn/chengwenliang/erp

core/CoreApp/controllers/Aatest.php

@@ -106,7 +106,7 @@ class Aatest extends Start_Controller {
     }
 
 	private function _ttexpress(){
-		$info = $this->logic_order->getInfo("number = 'TT-WK-251021-001	'");
+		$info = $this->logic_order->getInfo("number = 'TT-WK-251021-001'");
 		$res = $this->express_tt->getData($info);
 	}
 	private function dokucun(){

core/CoreApp/models/Model_express_tt.php

@@ -5,19 +5,27 @@ class Model_express_tt extends Lin_Model {
         $this->load->_model("Model_apitt","apitt");
     }
     public function getData($info){
-        $shop_info = $this->db->from('shop')->where('id', $info['shop'])->get()->row();
+        if(empty($info)){
+             return $g = [
+                'x'=>0,
+                'Description'=>'订单信息不存在',
+            ];
+        }
+        $shop_info = $this->db->from('shop')->where('id', $info['shop'])->get()->result_array();
+        
         if(empty($shop_info)){
             return $g = [
                 'x'=>0,
                 'Description'=>'该商铺不存在',
             ];
         }
-        $order_info = $this->getDetail($info['orderinfo'],$shop_info);
+        $order_info = $this->getDetail($info['orderinfo'],$shop_info[0]);
 
     }
     //查询信息
     private function getDetail($orderinfo,$shop){
-        $res = $this->apitt->get_data([$orderinfo],$shop);
+        
+        $res = $this->apitt->get_data([$orderinfo,'577147793197142978'],$shop);
         echo "<pre>";
         print_r($res);
         die;