Skip to content

T
tl_estate
Commit 450c67a0 authored by hujun's avatar hujun
Browse files
Options

value

parent 8acb1a31
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
application/index/controller/PayLog.php
View file @ 450c67a0
......@@ -326,14 +326,14 @@ class PayLog extends Basic
$refund_pay_id = $m_refund->getFieldColumn('pay_log_id', ['pay_log_id'=>['in',$pay_id_array ]]);
foreach($list as $key => $value) {
if ($value['type'] != 10 && $value['type'] != 30) {
$list[$key]['bargain_id'] = empty($v['bargain_id']) ? '' : $v['bargain_id'];
$list[$key]['bargain_id'] = empty($value['bargain_id']) ? '' : $value['bargain_id'];
} else {
$list[$key]['bargain_id'] = '';
}
if (!empty($v['income_time'])) {
$income_time = date('Y-m-d H:i:s', strtotime($v['income_time']));
if ($income_time == $v['income_time']) {
if (!empty($value['income_time'])) {
$income_time = date('Y-m-d H:i:s', strtotime($value['income_time']));
if ($income_time == $value['income_time']) {
$list[$key]['income_time'] = $income_time;
} else {
$list[$key]['income_time'] = '';
......@@ -341,13 +341,13 @@ class PayLog extends Basic
}
$list[$key]['source_id'] = $list[$key]['is_adjustment'] = '';
if ($v['source'] == 2) {
$source_id = $m_pay_adjustment->getFieldColumn('id', ['new_paylog_id' => $v['id'], 'is_del' => 0]);
if ($value['source'] == 2) {
$source_id = $m_pay_adjustment->getFieldColumn('id', ['new_paylog_id' => $value['id'], 'is_del' => 0]);
$list[$key]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
$adjustment_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id' => $v['id'], 'is_del' => 0]);
$adjustment_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id' => $value['id'], 'is_del' => 0]);
$list[$key]['is_adjustment'] = $adjustment_id ? 1 : 0;
} else {
$source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id' => $v['id'], 'is_del' => 0]);
$source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id' => $value['id'], 'is_del' => 0]);
$list[$key]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
$list[$key]['is_adjustment'] = $source_id ? 1 : 0;
}
......
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