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
94e2a0da
Commit
94e2a0da
authored
Dec 06, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refundAmount
parent
d0125c61
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
RefundService.php
application/models/Business/Order/RefundService.php
+4
-1
No files found.
application/models/Business/Order/RefundService.php
View file @
94e2a0da
...
@@ -966,6 +966,7 @@ class RefundServiceModel extends \Business\AbstractModel
...
@@ -966,6 +966,7 @@ class RefundServiceModel extends \Business\AbstractModel
$shippingFee
==
ApiConst
::
zero
;
$shippingFee
==
ApiConst
::
zero
;
}
}
$orderGoodsConvert
=
$orderGoodsDao
->
getRefundOrderGoods
(
$orderGoods
);
$orderGoodsConvert
=
$orderGoodsDao
->
getRefundOrderGoods
(
$orderGoods
);
$returnData
=
array
(
$returnData
=
array
(
'orderId'
=>
(
int
)
$orderId
,
'orderId'
=>
(
int
)
$orderId
,
'orderSn'
=>
$orderInfo
[
'orderSn'
],
'orderSn'
=>
$orderInfo
[
'orderSn'
],
...
@@ -983,7 +984,9 @@ class RefundServiceModel extends \Business\AbstractModel
...
@@ -983,7 +984,9 @@ class RefundServiceModel extends \Business\AbstractModel
);
);
$refundCondition
=
$orderInfo
[
'refundCondition'
]
?
unserialize
(
$orderInfo
[
'refundCondition'
])
:
array
();
$refundCondition
=
$orderInfo
[
'refundCondition'
]
?
unserialize
(
$orderInfo
[
'refundCondition'
])
:
array
();
$returnData
[
'needShippingFee'
]
=
$orderInfo
[
'needShippingFee'
];
$returnData
[
'needShippingFee'
]
=
$orderInfo
[
'needShippingFee'
];
if
(
$orderInfo
[
'shippingType'
]
==
ApiConst
::
bySelf
){
$returnData
[
'needShippingFee'
]
=
ApiConst
::
zero
;
}
if
(
$orderInfo
[
'paymentTime'
])
{
if
(
$orderInfo
[
'paymentTime'
])
{
$orderConfirmUtil
=
\Order\OrderConfirmUtil
::
getInstance
();
$orderConfirmUtil
=
\Order\OrderConfirmUtil
::
getInstance
();
...
...
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