Commit b7234f3a authored by hujun's avatar hujun

site_id

parent 69222ecb
......@@ -291,7 +291,7 @@ class PayLog extends Basic
}
if (isset($params['site_id'])) {
$where['site_id'] = $params['site_id'];
$where['e.site_id'] = $params['site_id'];
}
return $where;
}
......@@ -707,13 +707,16 @@ class PayLog extends Basic
$where[] = ['EXP', '(select id from o_refund where pay_log_id=a.id and is_del = 0 group by pay_log_id) is null'];
$where[] = ['EXP', '(select id from o_paylog_adjustment where paylog_id=a.id and is_del = 0 group by paylog_id) is null '];
}
if (isset($this->params['site_id'])) {
$where['e.site_id'] = $this->params['site_id'];
}
try {
$order = new OPayLogModel();
if (empty($this->params['excel'])) {
$field = 'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,a.bargain_id,';
$field .= 'e.name,a.income_time,e.store_id,b.house_id,b.order_no,a.report_id,a.house_number,a.is_dividend,a.last_transfer_time,a.industry_type,a.agent_id,d.internal_address as address,e.name as agent_name';
$list = $order->getAddPayLogOrderListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
$m_pay_adjustment = new OPayLogAdjustment();
$m_report = new OReportModel();
$m_refund = new ORefundModel();
......
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