|
@@ -164,7 +164,7 @@ class Order extends Core
|
|
|
|
|
|
$where = array();
|
|
|
$where['create_uid'] = $this->data['uid'];
|
|
|
- $where['order_id'] = $order_id;
|
|
|
+ $where['order_id'] = $order['order_id'];
|
|
|
$where['type'] = 4;
|
|
|
|
|
|
Dever::setInput('set_product_id', $order['product_id']);
|
|
@@ -289,8 +289,8 @@ class Order extends Core
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //$this->data['order_id'] = $order_id;
|
|
|
- $this->data['order_id'] = $id;
|
|
|
+ $this->data['order_id'] = $order_id;
|
|
|
+ //$this->data['order_id'] = $id;
|
|
|
|
|
|
return $this->data;
|
|
|
}
|
|
@@ -453,6 +453,7 @@ class Order extends Core
|
|
|
$order = Dever::db('act/order')->one(array('order_id' => $order_id));
|
|
|
} else {
|
|
|
$order = Dever::db('act/order')->one($order_id);
|
|
|
+ $order['order_id'] = $order['id'];
|
|
|
}
|
|
|
|
|
|
return $order;
|