Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
af62d83f
Commit
af62d83f
authored
Dec 19, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
收款时间
parent
2bc53f73
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
Finance.php
application/index/controller/Finance.php
+7
-3
No files found.
application/index/controller/Finance.php
View file @
af62d83f
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment