Commit d2f19601 authored by hujun's avatar hujun

add field

parent d38d7e11
......@@ -3214,13 +3214,16 @@ class Finance extends Basic
try {
$order = new OPayLogModel();
$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';
$field = 'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,';
$field .= 'a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,a.bargain_id,a.is_open,';
$field .= 'e.name,a.income_time,e.store_id,b.house_id,b.order_no,a.report_id,a.house_number,a.is_dividend,';
$field .= '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);
$data['total'] = $order->getAddPayLogOrderListLimitTotal($where);
$m_pay_adjustment = new OPayLogAdjustment();
$m_refund = new ORefundModel();
$m_open = new OPayLogOpen();
foreach ($list as $k=>$v) {
$list[$k]['source_id'] = $list[$k]['is_adjustment'] = '';
if ($v['source'] == 2) {
......@@ -3257,6 +3260,13 @@ class Finance extends Basic
$list[$k]['pay_type_num'] = $v['pay_type'];
$list[$k]['type_num'] = $v['type'];
if (empty($v['is_open'])) {
$is_check = $m_open->getFieldOneValue('id', ['pay_log_id'=>$v['id']]);
$list[$k]['is_check'] = $is_check > 0 ? 1:0;
} else {
$list[$k]['is_check'] = 0;
}
}
$data['list'] = $list;
......
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