|
@@ -91,7 +91,7 @@ class Merchant
|
|
|
return $result;
|
|
|
}
|
|
|
|
|
|
- public function getInfo($account_id, $project_id, $id, $parent)
|
|
|
+ public function getInfo($account_id, $project_id, $id, $parent, $array = false)
|
|
|
{
|
|
|
list($project, $table) = explode('/', $parent);
|
|
|
$where = array();
|
|
@@ -100,6 +100,9 @@ class Merchant
|
|
|
$where['relate_id'] = $id;
|
|
|
$data = Dever::db('pay/yspay_merchant')->find($where);
|
|
|
|
|
|
+ if ($array) {
|
|
|
+ return $data;
|
|
|
+ }
|
|
|
$html = '';
|
|
|
if ($data) {
|
|
|
if (!$data['mid']) {
|