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
b5f28552
Commit
b5f28552
authored
May 25, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
028ff8ec
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
OrderLog.php
application/api_broker/controller/OrderLog.php
+2
-2
OBargainModel.php
application/model/OBargainModel.php
+2
-2
No files found.
application/api_broker/controller/OrderLog.php
View file @
b5f28552
...
...
@@ -522,10 +522,10 @@ class OrderLog extends Basic
if
(
empty
(
$this
->
params
[
'id'
])
||
empty
(
$this
->
params
[
'agent_id'
])
||
empty
(
$this
->
params
[
'source'
]))
{
return
$this
->
response
(
101
,
'Id or agent_id or source is null.'
);
}
$source
=
empty
(
$this
->
params
[
'source'
])
?
0
:
$this
->
params
[
'source'
];
$bargain
=
new
OBargainModel
();
$data
[
'data'
]
=
$bargain
->
addBargainCommission
(
$this
->
params
[
'id'
],
$this
->
userId
,
$this
->
params
[
'agent_id'
],
$this
->
params
[
'role'
],
$this
->
params
[
'scale_fee'
],
$this
->
params
[
'scale'
]);
$this
->
params
[
'role'
],
$this
->
params
[
'scale_fee'
],
$this
->
params
[
'scale'
]
,
$source
);
if
(
$data
[
'data'
]
==
0
)
{
$data
[
'code'
]
=
101
;
...
...
application/model/OBargainModel.php
View file @
b5f28552
...
...
@@ -503,7 +503,7 @@ class OBargainModel extends Model
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
addBargainCommission
(
$id
,
$submit_agent_id
,
$agent_id
,
$role
,
$scale_fee
,
$scale
)
{
public
function
addBargainCommission
(
$id
,
$submit_agent_id
,
$agent_id
,
$role
,
$scale_fee
,
$scale
,
$source
)
{
$this
->
startTrans
();
$bargain_data
=
$this
->
where
(
'id'
,
$id
)
->
find
()
->
lock
(
true
);
...
...
@@ -521,7 +521,7 @@ class OBargainModel extends Model
$insert_data
[
'price'
]
=
$bargain_data
[
'price'
];
$insert_data
[
'commission'
]
=
$bargain_data
[
'commission'
];
$insert_data
[
'status'
]
=
$bargain_data
[
'status'
];
$insert_data
[
'source'
]
=
$
bargain_data
[
'source'
]
;
$insert_data
[
'source'
]
=
$
source
;
$insert_data
[
'role'
]
=
$role
;
$insert_data
[
'scale_fee'
]
=
$scale_fee
;
$insert_data
[
'scale'
]
=
$scale
;
...
...
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