Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
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
chenchuanwen
my-yaf-project
Commits
0aa0f826
Commit
0aa0f826
authored
Aug 21, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
4f67073e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
OrderService.php
application/models/Business/Order/OrderService.php
+2
-3
No files found.
application/models/Business/Order/OrderService.php
View file @
0aa0f826
...
...
@@ -568,7 +568,6 @@ class OrderServiceModel extends \Business\AbstractModel
if
(
empty
(
$orderGoods
)){
$orderGoods
=
array
();
}
echo
json_encode
(
$reciverInfo
);
exit
;
$returnData
=
array
(
'orderId'
=>
$this
->
order
[
'orderId'
],
'storeName'
=>
$this
->
order
[
'storeName'
],
...
...
@@ -582,8 +581,8 @@ class OrderServiceModel extends \Business\AbstractModel
'reciverName'
=>
$this
->
orderCommon
[
'reciverName'
],
'mobPhone'
=>
$reciverInfo
[
'mob_phone'
],
'street'
=>
$reciverInfo
[
'street'
],
'lng'
=>
$reciverInfo
[
'lng'
]
,
'lat'
=>
$reciverInfo
[
'lat'
]
,
'lng'
=>
isset
(
$reciverInfo
[
'lng'
])
?
$reciverInfo
[
'lng'
]
:
ApiConst
::
zero
,
'lat'
=>
isset
(
$reciverInfo
[
'lat'
])
?
$reciverInfo
[
'lat'
]
:
ApiConst
::
zero
,
'subAddress'
=>
isset
(
$reciverInfo
[
'sub_address'
])
?
$reciverInfo
[
'sub_address'
]
:
''
,
'orderGoods'
=>
$orderGoods
,
'shippingFee'
=>
$this
->
order
[
'shippingFee'
],
...
...
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