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
305632b9
Commit
305632b9
authored
Dec 06, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
goods
parent
c6cd1bbd
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
18 deletions
+18
-18
RefundService.php
application/models/Business/Order/RefundService.php
+18
-18
No files found.
application/models/Business/Order/RefundService.php
View file @
305632b9
...
@@ -1227,25 +1227,25 @@ class RefundServiceModel extends \Business\AbstractModel
...
@@ -1227,25 +1227,25 @@ class RefundServiceModel extends \Business\AbstractModel
$refundReturn
[
'refundText'
]
=
$refundReturnDao
->
getRefundTextStatus
(
$refundReturn
);
$refundReturn
[
'refundText'
]
=
$refundReturnDao
->
getRefundTextStatus
(
$refundReturn
);
$refundReturn
[
'stateName'
]
=
$refundReturn
[
'refundText'
];
$refundReturn
[
'stateName'
]
=
$refundReturn
[
'refundText'
];
$refundReturn
[
'goodsImage'
]
=
ImageUtil
::
getGoodsImgUrl
(
$refundReturn
[
'goodsImage'
],
ApiConst
::
goodsSmallSize
);
$refundReturn
[
'goodsImage'
]
=
ImageUtil
::
getGoodsImgUrl
(
$refundReturn
[
'goodsImage'
],
ApiConst
::
goodsSmallSize
);
//
$addressDao = \DAO\Order\DAddressModel::getInstance();
$addressDao
=
\DAO\Order\DAddressModel
::
getInstance
();
$info
=
$refundReturn
;
$info
=
$refundReturn
;
//
if ($refundReturn['refundType'] == ApiConst::refundTypeGoods) {
if
(
$refundReturn
[
'refundType'
]
==
ApiConst
::
refundTypeGoods
)
{
//
if ($refundReturn['addressId']) {
if
(
$refundReturn
[
'addressId'
])
{
//
$address = $addressDao->getAddressByAddressId($refundReturn['addressId'], $this->daddressField);
$address
=
$addressDao
->
getAddressByAddressId
(
$refundReturn
[
'addressId'
],
$this
->
daddressField
);
//
} else {
}
else
{
//
$address = $addressDao->getAddressByStoreId($refundReturn['storeId'], $this->daddressField);
$address
=
$addressDao
->
getAddressByStoreId
(
$refundReturn
[
'storeId'
],
$this
->
daddressField
);
//
}
}
//
if(!empty($address)){
if
(
!
empty
(
$address
)){
//
$address['isDefault'] = (int)$address['isDefault'];
$address
[
'isDefault'
]
=
(
int
)
$address
[
'isDefault'
];
//
$address['company']=isset( $address['company'])? $address['company']:'';
$address
[
'company'
]
=
isset
(
$address
[
'company'
])
?
$address
[
'company'
]
:
''
;
//
$info['dAddressInfo'] = $address;
$info
[
'dAddressInfo'
]
=
$address
;
//
}else{
}
else
{
//
$info['dAddressInfo'] =new \stdClass();
$info
[
'dAddressInfo'
]
=
new
\stdClass
();
//
}
}
//
//
} else {
}
else
{
//
$info['dAddressInfo'] = new \stdClass();
$info
[
'dAddressInfo'
]
=
new
\stdClass
();
//
}
}
$info
[
'canPlatformIn'
]
=
$refundReturnDao
->
isPlatformIn
(
$info
)
?
ApiConst
::
one
:
ApiConst
::
zero
;
$info
[
'canPlatformIn'
]
=
$refundReturnDao
->
isPlatformIn
(
$info
)
?
ApiConst
::
one
:
ApiConst
::
zero
;
$info
[
'canSendShippingType'
]
=
$refundReturnDao
->
checkIsAddReturnShipping
(
$info
)
?
ApiConst
::
one
:
ApiConst
::
zero
;
$info
[
'canSendShippingType'
]
=
$refundReturnDao
->
checkIsAddReturnShipping
(
$info
)
?
ApiConst
::
one
:
ApiConst
::
zero
;
if
(
$info
[
'refundShippingType'
]
==
ApiConst
::
bySeller
){
if
(
$info
[
'refundShippingType'
]
==
ApiConst
::
bySeller
){
...
...
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