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
0f270581
Commit
0f270581
authored
Jul 20, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
fc18e3b2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
OrderLog.php
application/api_broker/controller/OrderLog.php
+1
-1
OrderLogService.php
application/api_broker/service/OrderLogService.php
+2
-1
OBargainModel.php
application/model/OBargainModel.php
+1
-1
No files found.
application/api_broker/controller/OrderLog.php
View file @
0f270581
...
...
@@ -532,7 +532,7 @@ class OrderLog extends Basic
header
(
'Access-Control-Allow-Origin:*'
);
$params
=
$this
->
params
;
/* $params = array(
"bargain_id" =>
469
,
"bargain_id" =>
705
,
);*/
if
(
!
isset
(
$params
[
"bargain_id"
]))
{
return
$this
->
response
(
"101"
,
"请求参数错误"
);
...
...
application/api_broker/service/OrderLogService.php
View file @
0f270581
...
...
@@ -1191,7 +1191,7 @@ class OrderLogService
$bargainModel
=
new
OBargainModel
();
$bargain_info_filed
=
"a.id,a.house_number,a.account_time,a.account_statement,a.father_id,a.is_open,a.trade_type,
a.price,a.industry_type,a.estimated_receipt_date,a.commission,c.id,c.internal_title,c.internal_address,d.user_id,d.user_phone,d.user_name"
;
a.price,a.industry_type,a.estimated_receipt_date,a.commission,c.id
as house_id
,c.internal_title,c.internal_address,d.user_id,d.user_phone,d.user_name"
;
$result
=
[];
$bargainInfo
=
$bargainModel
->
selectBargainDetail
(
$bargain_info_filed
,
$params
);
...
...
@@ -1214,6 +1214,7 @@ class OrderLogService
b.cash,b.practical_fee,b.service_charge"
;
$cent_commission_arr
=
$bargainModel
->
selectBargainCommission
(
$field_commission
,
[
"bargain_id"
=>
$bargain_id
]);
//dump($cent_commission_arr);
$cent_commissions
=
[];
$result
[
"cent_commission"
]
=
$this
->
recursion
(
$cent_commission_arr
,
$cent_commissions
,
0
);
...
...
application/model/OBargainModel.php
View file @
0f270581
...
...
@@ -288,7 +288,7 @@ class OBargainModel extends Model
->
whereOr
(
$whereOr_
)
->
order
(
"a.id asc"
)
->
select
();
//
echo $this->getLastSql();
//
echo $this->getLastSql();
return
$result
;
}
...
...
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