Commit af62d83f authored by hujun's avatar hujun

收款时间

parent 2bc53f73
...@@ -2426,7 +2426,7 @@ class Finance extends Basic ...@@ -2426,7 +2426,7 @@ class Finance extends Basic
$m_pay_adjustment = new OPayLogAdjustment(); $m_pay_adjustment = new OPayLogAdjustment();
$m_report = new OReportModel(); $m_report = new OReportModel();
$m_agent_house = new GHousesToAgents(); $m_agent_house = new GHousesToAgents();
$m_agent = new AAgents();
foreach ($list as $k=>$v) { foreach ($list as $k=>$v) {
$source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $v['id']]); $source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $v['id']]);
$list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id); $list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
...@@ -2454,7 +2454,12 @@ class Finance extends Basic ...@@ -2454,7 +2454,12 @@ class Finance extends Basic
} }
if (!empty($v['income_time'])) { if (!empty($v['income_time'])) {
$list[$k]['income_time'] = date('Y-m-d', strtotime($v['income_time'])); $income_time = date('Y-m-d H:i:s', strtotime($v['income_time']));
if ($income_time == $v['income_time']) {
$list[$k]['income_time'] = $income_time;
} else {
$list[$k]['income_time'] = '';
}
} }
$list[$k]['pay_type_num'] = $v['pay_type']; $list[$k]['pay_type_num'] = $v['pay_type'];
...@@ -2757,7 +2762,6 @@ class Finance extends Basic ...@@ -2757,7 +2762,6 @@ class Finance extends Basic
$source_id = $m_pay_adjustment->getFieldValue('id', ['paylog_id'=> $pay_data['id']]); $source_id = $m_pay_adjustment->getFieldValue('id', ['paylog_id'=> $pay_data['id']]);
$pay_data['source_id'] = empty($source_id) ? 0 : $source_id; $pay_data['source_id'] = empty($source_id) ? 0 : $source_id;
$m_agent = new AAgents();
$m_agent_house = new GHousesToAgents(); $m_agent_house = new GHousesToAgents();
$m_store = new AStore(); $m_store = new AStore();
$m_report = new OReportModel(); $m_report = new OReportModel();
......
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