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
7ef0fd05
Commit
7ef0fd05
authored
May 29, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
ce9d48d2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
Finance.php
application/index/controller/Finance.php
+8
-4
No files found.
application/index/controller/Finance.php
View file @
7ef0fd05
...
@@ -645,7 +645,7 @@ class Finance extends Basic
...
@@ -645,7 +645,7 @@ class Finance extends Basic
*/
*/
public
function
addRealIncome
()
public
function
addRealIncome
()
{
{
if
(
empty
(
$this
->
params
[
'bargain_id'
])
||
!
isset
(
$this
->
params
[
'is_account_commission'
]))
{
if
(
empty
(
$this
->
params
[
'bargain_id'
])
||
!
isset
(
$this
->
params
[
'is_account_commission'
])
||
!
isset
(
$this
->
params
[
'is_account_commission'
])
)
{
return
$this
->
response
(
101
,
'请求参数错误'
);
return
$this
->
response
(
101
,
'请求参数错误'
);
}
}
...
@@ -704,9 +704,6 @@ class Finance extends Basic
...
@@ -704,9 +704,6 @@ class Finance extends Basic
$j
++
;
$j
++
;
}
}
}
}
if
(
$j
==
0
){
//没有新增数据,则把最后一条数据的分佣比例和应分佣金改掉
}
if
(
$j
>
0
)
{
if
(
$j
>
0
)
{
$m_partial
->
addCommission
(
$add_arr
);
$m_partial
->
addCommission
(
$add_arr
);
...
@@ -716,6 +713,13 @@ class Finance extends Basic
...
@@ -716,6 +713,13 @@ class Finance extends Basic
$m_partial
->
addCommission
(
$update_arr
);
$m_partial
->
addCommission
(
$update_arr
);
}
}
if
(
$j
==
0
&&
$this
->
params
[
'is_account_commission'
]
>
0
){
//没有新增数据,则把最后一条数据的分佣比例和应分佣金改掉
$params
[
'id'
]
=
$this
->
params
[
'is_account_commission'
];
$params
[
'should_commission'
]
=
$data
[
0
][
'should_commission'
];
$params
[
'scale'
]
=
$data
[
0
][
'scale'
];
$m_partial
->
addCommission
(
$params
);
}
// $data = $m_partial->addCommission($this->params, $this->userId);
// $data = $m_partial->addCommission($this->params, $this->userId);
return
$this
->
response
(
"200"
,
"request success"
,
[]);
return
$this
->
response
(
"200"
,
"request success"
,
[]);
}
}
...
...
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