Skip to content

M
my-yaf-project
Commit 305632b9 authored by christ's avatar christ
Browse files
Options

goods

parent c6cd1bbd
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
application/models/Business/Order/RefundService.php
View file @ 305632b9
......@@ -1227,25 +1227,25 @@ class RefundServiceModel extends \Business\AbstractModel
$refundReturn['refundText'] = $refundReturnDao->getRefundTextStatus($refundReturn);
$refundReturn['stateName']=$refundReturn['refundText'];
$refundReturn['goodsImage'] = ImageUtil::getGoodsImgUrl($refundReturn['goodsImage'], ApiConst::goodsSmallSize);
//$addressDao = \DAO\Order\DAddressModel::getInstance();
$addressDao = \DAO\Order\DAddressModel::getInstance();
$info = $refundReturn;
// if ($refundReturn['refundType'] == ApiConst::refundTypeGoods) {
// if ($refundReturn['addressId']) {
// $address = $addressDao->getAddressByAddressId($refundReturn['addressId'], $this->daddressField);
// } else {
// $address = $addressDao->getAddressByStoreId($refundReturn['storeId'], $this->daddressField);
// }
// if(!empty($address)){
// $address['isDefault'] = (int)$address['isDefault'];
// $address['company']=isset( $address['company'])? $address['company']:'';
// $info['dAddressInfo'] = $address;
// }else{
// $info['dAddressInfo'] =new \stdClass();
// }
//
// } else {
// $info['dAddressInfo'] = new \stdClass();
// }
if ($refundReturn['refundType'] == ApiConst::refundTypeGoods) {
if ($refundReturn['addressId']) {
$address = $addressDao->getAddressByAddressId($refundReturn['addressId'], $this->daddressField);
} else {
$address = $addressDao->getAddressByStoreId($refundReturn['storeId'], $this->daddressField);
}
if(!empty($address)){
$address['isDefault'] = (int)$address['isDefault'];
$address['company']=isset( $address['company'])? $address['company']:'';
$info['dAddressInfo'] = $address;
}else{
$info['dAddressInfo'] =new \stdClass();
}
} else {
$info['dAddressInfo'] = new \stdClass();
}
$info['canPlatformIn'] = $refundReturnDao->isPlatformIn($info) ? ApiConst::one : ApiConst::zero;
$info['canSendShippingType'] = $refundReturnDao->checkIsAddReturnShipping($info) ? ApiConst::one : ApiConst::zero;
if($info['refundShippingType']==ApiConst::bySeller){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment