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
8ed8be81
Commit
8ed8be81
authored
Jun 06, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
7dede655
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
5 deletions
+1
-5
OfficeOrderLogService.php
application/api_broker/service/OfficeOrderLogService.php
+1
-2
OfficeOrderModel.php
application/model/OfficeOrderModel.php
+0
-3
No files found.
application/api_broker/service/OfficeOrderLogService.php
View file @
8ed8be81
...
@@ -566,8 +566,7 @@ class OfficeOrderLogService
...
@@ -566,8 +566,7 @@ class OfficeOrderLogService
$oPayLogAdjustmentModel
=
new
OPayLogAdjustment
();
$oPayLogAdjustmentModel
=
new
OPayLogAdjustment
();
// $oRefundLogModel = new OfficeORefundLogRefundLogModel();
// $oRefundLogModel = new OfficeORefundLogRefundLogModel();
$orderData
=
$orderModel
->
selectOrderByOrderId
(
"a.f_id,c.title,c.address,b.room_number"
,
[
"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"
,
"找不到此订单编号"
];
...
...
application/model/OfficeOrderModel.php
View file @
8ed8be81
...
@@ -54,9 +54,6 @@ class OfficeOrderModel extends Model
...
@@ -54,9 +54,6 @@ class OfficeOrderModel extends Model
if
(
isset
(
$params
[
"f_id"
]))
{
if
(
isset
(
$params
[
"f_id"
]))
{
$where_
[
"a.f_id"
]
=
$params
[
"f_id"
];
$where_
[
"a.f_id"
]
=
$params
[
"f_id"
];
}
}
if
(
isset
(
$params
[
"house_id"
]))
{
$where_
[
"a.house_id"
]
=
$params
[
"house_id"
];
}
$result
=
$this
->
db_
$result
=
$this
->
db_
->
field
(
$filed
)
->
field
(
$filed
)
->
alias
(
"a"
)
->
alias
(
"a"
)
...
...
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