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
eaaaf1a1
Commit
eaaaf1a1
authored
Sep 10, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
246a4d3a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
OrderService.php
application/models/Business/Order/OrderService.php
+5
-3
No files found.
application/models/Business/Order/OrderService.php
View file @
eaaaf1a1
...
@@ -213,6 +213,7 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -213,6 +213,7 @@ class OrderServiceModel extends \Business\AbstractModel
*/
*/
public
function
getOrderDetail
(
$orderId
)
public
function
getOrderDetail
(
$orderId
)
{
{
error_reporting
(
E_ALL
);
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
$addressDao
=
\DAO\AddressModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
$addressDao
=
\DAO\AddressModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
$orderCommonDao
=
\DAO\Order\OrderCommonModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
$orderCommonDao
=
\DAO\Order\OrderCommonModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
...
@@ -260,13 +261,14 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -260,13 +261,14 @@ class OrderServiceModel extends \Business\AbstractModel
$returnData
[
'shippingTime'
]
=
$this
->
orderCommon
[
'shippingTime'
];
$returnData
[
'shippingTime'
]
=
$this
->
orderCommon
[
'shippingTime'
];
if
(
$returnData
[
'diliverymanId'
])
{
if
(
$returnData
[
'diliverymanId'
])
{
$returnData
[
'deliveryman'
]
=
$diliverymanDao
->
convert
(
$this
->
diliveryman
,
$this
->
getDeliveryManFields
());
$returnData
[
'deliveryman'
]
=
$diliverymanDao
->
convert
(
$this
->
diliveryman
,
$this
->
getDeliveryManFields
());
if
(
empty
(
$returnData
[
'deliveryman'
][
'qrcodePath'
])){
$returnData
[
'deliveryman'
][
'qrcodePath'
]
=
''
;
}
}
else
{
}
else
{
$returnData
[
'diliverymanId'
]
=
ApiConst
::
zero
;
$returnData
[
'diliverymanId'
]
=
ApiConst
::
zero
;
$returnData
[
'deliveryman'
]
=
new
\stdClass
();
$returnData
[
'deliveryman'
]
=
new
\stdClass
();
}
}
if
(
empty
(
$returnData
[
'deliveryman'
][
'qrcodePath'
])){
$returnData
[
'deliveryman'
][
'qrcodePath'
]
=
''
;
}
$returnData
[
'totalGoodsNum'
]
=
$orderGoodsDao
->
getGoodsCount
(
$this
->
orderGoodsList
);
$returnData
[
'totalGoodsNum'
]
=
$orderGoodsDao
->
getGoodsCount
(
$this
->
orderGoodsList
);
$returnData
[
'offlinePayway'
]
=
$this
->
store
[
'offlinePayway'
]
?
$this
->
store
[
'offlinePayway'
]
:
''
;
$returnData
[
'offlinePayway'
]
=
$this
->
store
[
'offlinePayway'
]
?
$this
->
store
[
'offlinePayway'
]
:
''
;
$returnData
[
'reciverInfo'
]
=
$this
->
address
;
$returnData
[
'reciverInfo'
]
=
$this
->
address
;
...
...
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