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
bfdc5bf5
Commit
bfdc5bf5
authored
Mar 20, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查询
parent
89b2904a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletion
+16
-1
Finance.php
application/index/controller/Finance.php
+1
-1
ORealIncome.php
application/model/ORealIncome.php
+15
-0
No files found.
application/index/controller/Finance.php
View file @
bfdc5bf5
...
@@ -659,7 +659,7 @@ class Finance extends Basic
...
@@ -659,7 +659,7 @@ class Finance extends Basic
$partial_commission
[
$k2
][
'income_time_add'
]
=
$income_time_add
;
$partial_commission
[
$k2
][
'income_time_add'
]
=
$income_time_add
;
}
}
}
else
{
}
else
{
$income_time
=
$m_real
->
get
BargainIncome
(
$this
->
params
[
'id'
],
'id,income_time'
);
$income_time
=
$m_real
->
get
Income
([
'id'
=>
$v2
[
'real_income_id'
]
],
'id,income_time'
);
if
(
empty
(
$income_time
))
{
if
(
empty
(
$income_time
))
{
$partial_commission
[
$k2
][
'income_time'
]
=
[];
$partial_commission
[
$k2
][
'income_time'
]
=
[];
}
else
{
}
else
{
...
...
application/model/ORealIncome.php
View file @
bfdc5bf5
...
@@ -52,6 +52,21 @@ class ORealIncome extends BaseModel
...
@@ -52,6 +52,21 @@ class ORealIncome extends BaseModel
->
find
();
->
find
();
}
}
/**
* @param int $bargain_id
* @param string $field
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
getIncome
(
$where
,
$field
=
'id as fee_id,money,income_time'
)
{
$where
[
'is_del'
]
=
0
;
return
$this
->
field
(
$field
)
->
where
(
$where
)
->
find
();
}
/**
/**
* @param int $field
* @param int $field
* @param array $where
* @param array $where
...
...
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