dever 6 years ago
parent
commit
69eea185ae
2 changed files with 8 additions and 2 deletions
  1. 1 1
      act/database/order_temp.php
  2. 7 1
      act/src/Order.php

+ 1 - 1
act/database/order_temp.php

@@ -102,7 +102,7 @@ return array
             'update'    => 'text',
             'search'    => 'fulltext',
             //'list'        => true,
-            'list'        => 'Dever::load("act/order.getOrderId", {id})',
+            'list'        => 'Dever::load("act/order.getOrderTempId", {id})',
         ), 
 
         'cate_journal'     => array

+ 7 - 1
act/src/Order.php

@@ -433,7 +433,7 @@ class Order extends Core
 
     public function getOrderId($id)
     {
-        $info = Dever::db('act/order_temp')->one($id);
+        $info = Dever::db('act/order')->one($id);
         if ($info['order_id']) {
             return $info['order_id'] . '/' . $id;
         }
@@ -441,6 +441,12 @@ class Order extends Core
         return $this->createOrderId($info, $id) . '/' . $id;
     }
 
+    public function getOrderTempId($id)
+    {
+        $info = Dever::db('act/order')->one($id);
+        return $this->createOrderId($info, $id) . '/' . $id;
+    }
+
     public function getOrder($order_id)
     {
         if (!is_numeric($order_id)) {