Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
2
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
郝肖肖
9 years ago
Commit
ee72055a0445d9ca6d8c70c3da85535e551bce7e
2 parents
c8efe74f
d4b1ed83
Merge branch 'release/4.4' of
http://git.dev.yoho.cn/web/yohobuy
into release/4.4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
yohobuy/www.yohobuy.com/application/models/Home/Order.php
yohobuy/www.yohobuy.com/application/models/Home/Order.php
View file @
ee72055
...
...
@@ -330,6 +330,7 @@ class OrderModel
$result
[
'courierNumbe'
]
=
isset
(
$logistics
[
'data'
][
'express_number'
])
?
$logistics
[
'data'
][
'express_number'
]
:
''
;
$expressDetail
=
isset
(
$logistics
[
'data'
][
'express_detail'
])
?
$logistics
[
'data'
][
'express_detail'
]
:
array
();
if
(
isset
(
$expressDetail
)
&&
$expressDetail
)
{
$logisticsTmp
=
$result
[
'logistics'
][
0
];
//暂存
$result
[
'logistics'
]
=
array
();
foreach
(
$expressDetail
as
$value
)
{
$pos
=
stripos
(
$value
[
'accept_address'
],
' '
)
/
3
;
...
...
@@ -342,6 +343,8 @@ class OrderModel
$result
[
'logistics'
][]
=
$value
[
'acceptTime'
]
.
$city
.
$exInfo
;
}
}
//把最初的处理放最后
$result
[
'logistics'
][]
=
$logisticsTmp
;
}
}
}
...
...
Please
register
or
login
to post a comment