lvhao 1 день тому
батько
коміт
9433d37478

+ 2 - 0
core/CoreApp/controllers/Systemprint.php

@@ -1913,7 +1913,9 @@ class Systemprint extends Start_Controller {
 		$fullorder['shipremarks'] = str_replace(array('&lt;','&gt;'),array('<','>'),$fullorder['shipremarks']);
 		$fullorder['shipremarks'] = str_replace(array('<','>',';',';'),array('&lt','&gt',';<br>',';<br>'),$fullorder['shipremarks']);
 		$shop = $this->shop->read($fullorder['shop']);
+		$fullorder['tmp_shop_id'] = $fullorder['shop'];
 		$fullorder['shop'] = $shop['shopname'];
+		
 		$shoptype = $this->typeclass->read($shop['type']);
 		$fullorder['shoptype'] = $shoptype['classtitle'];
 		$fullorder['city'] = preg_replace('/( | | |\s)/',' ',$fullorder['city']);

+ 6 - 1
core/CoreApp/models/Model_express_tt.php

@@ -13,7 +13,12 @@ class Model_express_tt extends Lin_Model {
                'Description'=>'订单信息不存在',
            ];
        }
-       $shop_info = $this->db->from('shop')->where('id', $info['shop'])->get()->result_array();
+       if(is_numeric($info['shop'])){
+         $shopid = $info['shop'];
+       }else{
+         $shopid = $info['tmp_shop_id'];
+       }
+       $shop_info = $this->db->from('shop')->where('id', $shopid)->get()->result_array();
        
        if(empty($shop_info)){
            return  [