Commit 9401a0d6 authored by hujun's avatar hujun

site_id

parent 7cc3cb60
...@@ -83,6 +83,11 @@ class PayLog extends Basic ...@@ -83,6 +83,11 @@ class PayLog extends Basic
if (!empty($this->params['order_id'])) { if (!empty($this->params['order_id'])) {
$where['a.order_id'] = $this->params['order_id']; $where['a.order_id'] = $this->params['order_id'];
} }
if (!empty($this->params['site_id'])) {
$where['e.site_id'] = $this->params['site_id'];
}
$where[] = ['EXP', 'g.id IS NULL AND f.id IS NULL']; $where[] = ['EXP', 'g.id IS NULL AND f.id IS NULL'];
try { try {
$order = new OPayLogModel(); $order = new OPayLogModel();
...@@ -285,6 +290,9 @@ class PayLog extends Basic ...@@ -285,6 +290,9 @@ class PayLog extends Basic
$where['a.is_del'] = $params['is_del']; $where['a.is_del'] = $params['is_del'];
} }
if (isset($params['site_id'])) {
$where['site_id'] = $params['site_id'];
}
return $where; return $where;
} }
......
...@@ -228,6 +228,10 @@ class Refund extends Basic ...@@ -228,6 +228,10 @@ class Refund extends Basic
} }
} }
if ($this->params['status'] > 0 && isset($this->params['site_id'])) {
$where['c.site_id'] = $this->params['site_id'];
}
if (!empty($this->params['start_time']) && empty($this->params['end_time'])) { if (!empty($this->params['start_time']) && empty($this->params['end_time'])) {
$where['a.create_time'] = ['>', $this->params['start_time'] . ' 00:00:00']; $where['a.create_time'] = ['>', $this->params['start_time'] . ' 00:00:00'];
} }
...@@ -377,9 +381,17 @@ class Refund extends Basic ...@@ -377,9 +381,17 @@ class Refund extends Basic
$where['a.status'] = ['in', '0,1']; $where['a.status'] = ['in', '0,1'];
} else { } else {
$where['a.status'] = $this->params['status']; $where['a.status'] = $this->params['status'];
if ($this->params['status'] == '0') {
$where['c.site_id'] = $this->siteId;
}
} }
} }
if ($this->params['status'] > 0 && isset($this->params['site_id'])) {
$where['c.site_id'] = $this->params['site_id'];
}
if (!empty($this->params['start_time']) && empty($this->params['end_time'])) { if (!empty($this->params['start_time']) && empty($this->params['end_time'])) {
$where['a.create_time'] = ['>', $this->params['start_time'] . ' 00:00:00']; $where['a.create_time'] = ['>', $this->params['start_time'] . ' 00:00:00'];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment