Merge branch 'ccw' of http://git.shenbd.com/api-project-dev/api.shenbd.com into master_dev

application/models/Business/Order/RefundService.php

@@ -1389,11 +1389,13 @@ class RefundServiceModel extends \Business\AbstractModel
         $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 ($refundReturn['addressId']) {
+//                $address = $addressDao->getAddressByAddressId($refundReturn['addressId'], $this->daddressField);
+//            } else {
+//                $address = $addressDao->getAddressByStoreId($refundReturn['storeId'], $this->daddressField);
+//            }
+//            $address['areaInfo']=Common::getRealStr($address['areaInfo']);
+            $address=$refundReturn['reciverInfo'];
             $address['areaInfo']=Common::getRealStr($address['areaInfo']);
             if(!empty($address)){
                 $address['isDefault'] = (int)$address['isDefault'];

conf/url.ini

@@ -127,7 +127,7 @@ config.url.resourcesHost = "http://local.qm.com"
 config.url.userHost = ""
 
 ; oss 域名
-config.url.ossHost = "https://imgpre.shenbd.com"
+config.url.ossHost = "https://img.shenbd.com"
 
 ;推送域名
 config.url.pushHost="192.168.1.201:9503";