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
7dede655
Commit
7dede655
authored
Jun 06, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
581b4261
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
OfficeOrderLogService.php
application/api_broker/service/OfficeOrderLogService.php
+4
-5
OfficeOrderModel.php
application/model/OfficeOrderModel.php
+2
-1
No files found.
application/api_broker/service/OfficeOrderLogService.php
View file @
7dede655
<?php
<?php
namespace
app\api_broker\service
;
namespace
app\api_broker\service
;
/**
/**
* Created by PhpStorm.
* Created by PhpStorm.
...
@@ -566,7 +567,7 @@ class OfficeOrderLogService
...
@@ -566,7 +567,7 @@ class OfficeOrderLogService
// $oRefundLogModel = new OfficeORefundLogRefundLogModel();
// $oRefundLogModel = new OfficeORefundLogRefundLogModel();
$orderData
=
$orderModel
->
selectOrderByOrderId
(
"a.f_id,
a.house_title,c.address as internal_address
"
,
[
"order_id"
=>
$order_id
]);
$orderData
=
$orderModel
->
selectOrderByOrderId
(
"a.f_id,
b.title,b.address,c.room_number
"
,
[
"order_id"
=>
$order_id
]);
//dump($orderData);
//dump($orderData);
if
(
count
(
$orderData
)
<=
0
)
{
if
(
count
(
$orderData
)
<=
0
)
{
return
[
"101"
,
"找不到此订单编号"
];
return
[
"101"
,
"找不到此订单编号"
];
...
@@ -582,8 +583,8 @@ class OfficeOrderLogService
...
@@ -582,8 +583,8 @@ class OfficeOrderLogService
}
}
//报备
//报备
$reportData
[
0
][
"step_name"
]
=
"report"
;
$reportData
[
0
][
"step_name"
]
=
"report"
;
$reportData
[
0
][
"house_title"
]
=
$orderData
[
0
][
"
house_
title"
];
$reportData
[
0
][
"house_title"
]
=
$orderData
[
0
][
"title"
];
$reportData
[
0
][
"internal_address"
]
=
$orderData
[
0
][
"
internal_address
"
];
$reportData
[
0
][
"internal_address"
]
=
$orderData
[
0
][
"
address"
]
.
" "
.
$orderData
[
0
][
"room_number
"
];
$result
[
$sort
++
]
=
$reportData
[
0
];
$result
[
$sort
++
]
=
$reportData
[
0
];
//进场 march in
//进场 march in
...
@@ -960,13 +961,11 @@ class OfficeOrderLogService
...
@@ -960,13 +961,11 @@ class OfficeOrderLogService
$oBargainModel
=
new
OfficeOBargainModel
();
$oBargainModel
=
new
OfficeOBargainModel
();
$field_report
=
"a.id,a.create_time,a.predict_see_time,a.intro,b.id as order_id,b.house_id,b.house_title,c.id as agent_id,c.name,c.img,d.store_name"
;
$field_report
=
"a.id,a.create_time,a.predict_see_time,a.intro,b.id as order_id,b.house_id,b.house_title,c.id as agent_id,c.name,c.img,d.store_name"
;
$reportData
=
$oReportModel
->
selectReportByUserId
(
$field_report
,
[
"user_id"
=>
$user_id
]);
$reportData
=
$oReportModel
->
selectReportByUserId
(
$field_report
,
[
"user_id"
=>
$user_id
]);
$order_ids
=
$report_ids
=
""
;
$order_ids
=
$report_ids
=
""
;
//报备
//报备
foreach
(
$reportData
as
$k
=>
$v
)
{
foreach
(
$reportData
as
$k
=>
$v
)
{
...
...
application/model/OfficeOrderModel.php
View file @
7dede655
...
@@ -60,7 +60,8 @@ class OfficeOrderModel extends Model
...
@@ -60,7 +60,8 @@ class OfficeOrderModel extends Model
$result
=
$this
->
db_
$result
=
$this
->
db_
->
field
(
$filed
)
->
field
(
$filed
)
->
alias
(
"a"
)
->
alias
(
"a"
)
->
join
(
"g_houses b"
,
"a.house_id = b.id"
,
"left"
)
->
join
(
"office_g_room b"
,
"a.house_id = b.id"
,
"left"
)
->
join
(
"office_g_building c"
,
"a.id = b.building_id"
,
"left"
)
->
where
(
$where_
)
->
where
(
$where_
)
->
select
();
->
select
();
//echo $this->db_->getLastSql();
//echo $this->db_->getLastSql();
...
...
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