debug dblock

data/logic/delivery.logic.php

@@ -30,7 +30,7 @@ class deliveryLogic
             return false;
         }
 
-        $order_list = Model('order')->getNormalOrderList(array('pay_sn'=> $pay_sn), $this->page, '*', 'order_id desc', '', array('order_address', 'order_goods'));
+        $order_list = Model('order')->getNormalOrderList(array('pay_sn'=> $pay_sn), $this->page, '*', 'order_id desc', '', array('order_address', 'order_goods'),true);
         if(empty($order_list)) {
             Log::record("putOrder:cannot get order list when pay_sn={$pay_sn},trade_no={$trade_no} ",Log::DEBUG);
             return false;

data/model/order.model.php

@@ -88,9 +88,9 @@ class orderModel extends Model
      * @param unknown $extend 追加返回那些表的信息,如array('order_common','order_goods','store')
      * @return Ambigous <multitype:boolean Ambigous <string, mixed> , unknown>
      */
-    public function getNormalOrderList($condition, $pagesize = '', $field = '*', $order = 'order_id desc', $limit = '', $extend = array()){
+    public function getNormalOrderList($condition, $pagesize = '', $field = '*', $order = 'order_id desc', $limit = '', $extend = array(),$master = false){
         $condition['delete_state'] = 0;
-        return $this->getOrderList($condition, $pagesize, $field, $order, $limit, $extend);
+        return $this->getOrderList($condition, $pagesize, $field, $order, $limit, $extend,$master);
     }
 
     /**