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
f4a2f44d
Commit
f4a2f44d
authored
Jul 05, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
3953ed3f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
Broker.php
application/api_broker/controller/Broker.php
+5
-2
OrderLogService.php
application/api_broker/service/OrderLogService.php
+1
-1
No files found.
application/api_broker/controller/Broker.php
View file @
f4a2f44d
...
...
@@ -21,6 +21,7 @@ use app\model\NoteLog;
use
app\model\UPhoneFollowPp
;
use
app\model\Users
;
use
think\Exception
;
use
Think\Log
;
use
think\Request
;
class
Broker
extends
Basic
...
...
@@ -199,6 +200,7 @@ class Broker extends Basic
*/
private
function
judgeBand
(
string
$device_id
,
int
$agent_id
,
string
$model
,
int
$type
,
string
$push_id
)
:
bool
{
Log
::
record
(
"push_id -----------------------"
.
$push_id
);
$params
[
"agent_id"
]
=
$agent_id
;
$result
=
$this
->
aBD
->
getDeviceByAgentId
(
$params
);
...
...
@@ -221,9 +223,10 @@ class Broker extends Basic
$is_exits
=
true
;
}
//当个推返回的id改变时则更新记录
if
(
!
empty
(
$push_id
)
&&
$push_id
!=
$item
[
"push_id"
])
if
(
!
empty
(
$push_id
)
&&
$push_id
!=
$item
[
"push_id"
]){
Log
::
record
(
"push_id ----*************-------------------"
.
$push_id
);
$this
->
aBD
->
updateDevice
([
"id"
=>
$item
[
"id"
],
"push_id"
=>
$push_id
]);
}
}
}
if
(
!
$is_exits
&&
$type
==
0
)
...
...
application/api_broker/service/OrderLogService.php
View file @
f4a2f44d
...
...
@@ -204,7 +204,7 @@ class OrderLogService
public
function
selectOrderDetail
(
$where_
)
{
$orderModel
=
new
OrderModel
();
$field
=
"a.id,a.order_no,a.house_id,a.house_title,b.id as report_id,b.user_id,c.user_nick,c.user_phone,
$field
=
"a.id,a.order_no,a.house_id,a.house_title,b.id as report_id,b.user_id,c.user_n
ame as user_n
ick,c.user_phone,
c.user_pic,c.sex"
;
$result
=
$orderModel
->
selectOrderDetail
(
$field
,
$where_
);
foreach
(
$result
as
$k
=>
$v
)
{
...
...
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