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
70398f51
Commit
70398f51
authored
Jun 13, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改成交报告
parent
510e07b5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
OrderLog.php
application/api_broker/controller/OrderLog.php
+1
-1
Finance.php
application/index/controller/Finance.php
+1
-1
OBargainModel.php
application/model/OBargainModel.php
+1
-0
No files found.
application/api_broker/controller/OrderLog.php
View file @
70398f51
...
...
@@ -538,7 +538,7 @@ class OrderLog extends Basic
}
$source
=
empty
(
$this
->
params
[
'source'
])
?
0
:
$this
->
params
[
'source'
];
$bargain
=
new
OBargainModel
();
$data
[
'data'
]
=
$bargain
->
addBargainCommission
(
$this
->
params
[
'id'
],
$this
->
user
Id
,
$this
->
params
[
'agent_id'
],
$data
[
'data'
]
=
$bargain
->
addBargainCommission
(
$this
->
params
[
'id'
],
$this
->
agent
Id
,
$this
->
params
[
'agent_id'
],
$this
->
params
[
'role'
],
$this
->
params
[
'scale_fee'
],
$this
->
params
[
'scale'
],
$source
);
if
(
$data
[
'data'
]
==
0
)
{
...
...
application/index/controller/Finance.php
View file @
70398f51
...
...
@@ -942,7 +942,7 @@ class Finance extends Basic
$pageNo
=
empty
(
$this
->
params
[
'pageNo'
])
?
1
:
$this
->
params
[
'pageNo'
];
$pageSize
=
empty
(
$this
->
params
[
'pageSize'
])
?
15
:
$this
->
params
[
'pageSize'
];
$fields
=
'a.id,a.create_time,e.name,e.phone,a.fee,b.house_number,d.internal_address,
b
.agent_id,b.father_id,b.order_id'
;
$fields
=
'a.id,a.create_time,e.name,e.phone,a.fee,b.house_number,d.internal_address,
a
.agent_id,b.father_id,b.order_id'
;
$where
[
'c.is_del'
]
=
0
;
$where
[
'b.status'
]
=
[
'in'
,
10
,
11
];
//10已提交 11审核成功
...
...
application/model/OBargainModel.php
View file @
70398f51
...
...
@@ -709,6 +709,7 @@ class OBargainModel extends Model
$insert_data
[
'account_statement'
]
=
$bargain_data
[
'account_statement'
];
$insert_data
[
'is_commission'
]
=
$bargain_data
[
'is_commission'
];
$insert_data
[
'content'
]
=
$bargain_data
[
'content'
];
$insert_data
[
'industry_type'
]
=
$bargain_data
[
'industry_type'
];
$result
=
$this
->
insert
(
$insert_data
);
if
(
$result
==
1
)
{
$this
->
commit
();
...
...
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