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
1176da4c
Commit
1176da4c
authored
Apr 03, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
ca76e7f0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
0 deletions
+56
-0
TradeLog.php
application/api/controller/TradeLog.php
+49
-0
Performance.php
application/api_broker/controller/Performance.php
+4
-0
OrderModel.php
application/model/OrderModel.php
+3
-0
No files found.
application/api/controller/TradeLog.php
View file @
1176da4c
...
@@ -7,6 +7,7 @@ use app\model\Evaluate;
...
@@ -7,6 +7,7 @@ use app\model\Evaluate;
use
app\model\HouseImgs
;
use
app\model\HouseImgs
;
use
app\model\HouseInfos
;
use
app\model\HouseInfos
;
use
app\model\JournalAccounts
;
use
app\model\JournalAccounts
;
use
app\model\OrderModel
;
use
app\model\SubletModel
;
use
app\model\SubletModel
;
/**
/**
...
@@ -20,6 +21,7 @@ class TradeLog extends Basic
...
@@ -20,6 +21,7 @@ class TradeLog extends Basic
{
{
protected
$journalAccountsMode
;
protected
$journalAccountsMode
;
protected
$orderModel
;
protected
$dbImg
;
protected
$dbImg
;
protected
$evaluateMode
;
protected
$evaluateMode
;
protected
$houseInfoModel
;
protected
$houseInfoModel
;
...
@@ -29,6 +31,7 @@ class TradeLog extends Basic
...
@@ -29,6 +31,7 @@ class TradeLog extends Basic
{
{
parent
::
__construct
(
$request
);
parent
::
__construct
(
$request
);
$this
->
journalAccountsMode
=
new
JournalAccounts
();
$this
->
journalAccountsMode
=
new
JournalAccounts
();
$this
->
orderModel
=
new
OrderModel
();
$this
->
dbImg
=
new
HouseImgs
();
$this
->
dbImg
=
new
HouseImgs
();
$this
->
houseInfoModel
=
new
HouseInfos
();
$this
->
houseInfoModel
=
new
HouseInfos
();
$this
->
evaluateMode
=
new
Evaluate
();
$this
->
evaluateMode
=
new
Evaluate
();
...
@@ -89,4 +92,49 @@ class TradeLog extends Basic
...
@@ -89,4 +92,49 @@ class TradeLog extends Basic
}
}
public
function
getTradeListV2
(){
$params
=
$this
->
params
;
/* $params = array(
"user_id" => "4",
"pageNo" => 1,
"pageSize" => 15,
);*/
$pageNo
=
empty
(
$params
[
'pageNo'
])
?
1
:
$params
[
'pageNo'
];
$pageSize
=
empty
(
$params
[
'pageSize'
])
?
15
:
$params
[
'pageSize'
];
if
(
!
isset
(
$params
[
"user_id"
]))
{
return
$this
->
response
(
"101"
,
"userId不能为空"
);
}
$order_
=
'a.created desc'
;
$field
=
"min(a.id) as id,a.tradecode,a.created as singntime,b.phpone,b.house_id,b.agent_id"
;
$result
=
$this
->
journalAccountsMode
->
getJournalAccountsList
(
$pageNo
,
$pageSize
,
$order_
,
$field
,
$params
);
if
(
count
(
$result
)
<=
0
)
{
return
$this
->
response
(
"200"
,
"请求数据为空"
);
}
foreach
(
$result
as
$key
=>
$val
)
{
$houseInfo
=
$this
->
houseInfoModel
->
getHouseDetails
(
"a.room_num_left,b.foreign_name"
,
array
(
"a.id"
=>
$val
[
"house_id"
]
));
$result
[
$key
][
"room_num_left"
]
=
$houseInfo
[
"room_num_left"
];
$result
[
$key
][
"foreign_name"
]
=
$houseInfo
[
"foreign_name"
];
$result
[
$key
][
"api_path"
]
=
IMG_PATH
;
$imgParam
[
"house_id"
]
=
$val
[
"house_id"
];
$imgParam
[
"imgtype"
]
=
1
;
//默认主图
$result
[
$key
][
"images"
]
=
$this
->
dbImg
->
getHouseImages
(
$imgParam
,
1
);
$evaluateResult
=
$this
->
evaluateMode
->
getIsEvaluate
(
20
,
$val
[
"id"
],
$params
[
"user_id"
]);
$result
[
$key
][
"is_evaluate"
]
=
count
(
$evaluateResult
)
>
0
?
1
:
0
;
//todo 是否以上架
$subParam
[
"user_id"
]
=
$params
[
"user_id"
];
$subParam
[
"house_id"
]
=
$val
[
"house_id"
];
$subletResult
=
$this
->
subletModel
->
getSubletByHoseId
(
$subParam
);
if
(
count
(
$subletResult
)
>
0
)
{
$result
[
$key
][
"is_added"
]
=
$subletResult
[
0
][
"status"
];
}
else
{
$result
[
$key
][
"is_added"
]
=
-
1
;
}
}
return
$this
->
response
(
"200"
,
"request"
,
$result
);
}
}
}
\ No newline at end of file
application/api_broker/controller/Performance.php
View file @
1176da4c
...
@@ -35,6 +35,7 @@ class Performance extends Basic
...
@@ -35,6 +35,7 @@ class Performance extends Basic
*/
*/
public
function
selectPerformanceByTime
()
public
function
selectPerformanceByTime
()
{
{
header
(
'Access-Control-Allow-Origin:*'
);
$params
=
$this
->
params
;
$params
=
$this
->
params
;
/* $params = array(
/* $params = array(
"agent_id" => 1,
"agent_id" => 1,
...
@@ -99,6 +100,7 @@ class Performance extends Basic
...
@@ -99,6 +100,7 @@ class Performance extends Basic
*/
*/
public
function
storePerformanceBySearch
()
public
function
storePerformanceBySearch
()
{
{
header
(
'Access-Control-Allow-Origin:*'
);
$params
=
$this
->
params
;
$params
=
$this
->
params
;
/* $params = array(
/* $params = array(
"agent_id" => 1,
"agent_id" => 1,
...
@@ -120,6 +122,7 @@ class Performance extends Basic
...
@@ -120,6 +122,7 @@ class Performance extends Basic
*/
*/
public
function
orderNoList
()
public
function
orderNoList
()
{
{
header
(
'Access-Control-Allow-Origin:*'
);
$params
=
$this
->
params
;
$params
=
$this
->
params
;
/* $params = array(
/* $params = array(
"agent_id" => 1,
"agent_id" => 1,
...
@@ -152,6 +155,7 @@ class Performance extends Basic
...
@@ -152,6 +155,7 @@ class Performance extends Basic
* @return \think\Response
* @return \think\Response
*/
*/
public
function
storeOrAgentSort
(){
public
function
storeOrAgentSort
(){
header
(
'Access-Control-Allow-Origin:*'
);
$params
=
$this
->
params
;
$params
=
$this
->
params
;
/* $params = array(
/* $params = array(
"agent_id" => 1,
"agent_id" => 1,
...
...
application/model/OrderModel.php
View file @
1176da4c
...
@@ -150,4 +150,6 @@ class OrderModel extends Model
...
@@ -150,4 +150,6 @@ class OrderModel extends Model
->
where
(
'id'
,
$order_id
)
->
where
(
'id'
,
$order_id
)
->
find
();
->
find
();
}
}
// public function getOrder
}
}
\ No newline at end of file
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