Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

application/models/Business/Goods/GoodsCommonService.php

@@ -542,7 +542,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $productData = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsAttributeRedisModel::getInstance(),array(&$attrbuteDAO, 'option'),array('attribute,attribute_value',array('goods_commonid'=>$goodsCommonId)),\Our\ApiConst::oneDaySecond,array($goodsCommonId));
 
         $html = array('width'=>750,'height'=>$commonInfo['goods_height'],'url'=>\Our\Common::getBaseUrl().'/index/goodsDetail?goodsCommonId='.$goodsCommonId);
-        if($commonInfo['is_del'] == 1) $commonInfo['goods_state'] = 0;
+        if($commonInfo['is_del'] == 1 || $commonInfo['goods_state'] == 10) $commonInfo['goods_state'] = 0;
         unset($attrs['commonInfo']);
         return array_merge(array('storeId'=>$commonInfo['store_id'],'goodsId'=>$commonInfo['goodsId'],'goodsName'=>$commonInfo['goods_name'],'goodsVerify'=>$commonInfo['goods_verify'],'goodsState'=>$commonInfo['goods_state'],'saleCount'=>$commonInfo['sale_num'],'collectionState'=>$collectionState,'isOwn'=>$isOwn,'isHot'=>$commonInfo['goods_hot'],'isRecoment'=>$commonInfo['goods_commend'],'isFree'=>$commonInfo['goods_free'],'isVirtual'=>$commonInfo['is_virtual'],'goodsMostLimit'=>$commonInfo['goods_most_limit'],'goodsLeastLimit'=>$commonInfo['goods_least_limit'],'goodsTotalLimit'=>$commonInfo['goods_total_limit'],'address'=>$area,'range'=>$rangePrice,'productData'=>$productData,'htmlContent'=>$html,'videoUrl'=>$commonInfo['goods_youku_url'],'subheading'=>$commonInfo['goods_jingle'],'inStoreService'=>$in_store_service_flag),$attrs);
     }

application/models/Business/Order/RefundService.php

@@ -702,6 +702,9 @@ class RefundServiceModel extends \Business\AbstractModel
                 if(!empty($value['picInfo'])){
                     $value['picInfo'] = $refundReturnDao->getRefundPics($value['picInfo']['buyer']);
                 }
+                if($value['goodsState']>ApiConst::goodsStateWaitRecieve){
+                    $value['shippingOver']=ApiConst::shippingOver;
+                }
                 unset($value['goodsSpec']);
                 // unset($value['picInfo']);
             }

application/models/DAO/Order/ApiReciverInfo.php

@@ -62,7 +62,12 @@ class ApiReciverInfoModel extends \DAO\AbstractModel
         $this->cityCode=isset($reciverInfo['citycode'])?$reciverInfo['citycode']:'';
         $this->addressId=$reciverInfo['address_id'];
         $this->subAddress=isset($reciverInfo['subaddress'])?$reciverInfo['subaddress']:'';
-        $this->trueName=$reciverInfo['name'];
+        if(isset($reciverInfo['name'])&& $reciverInfo['name']){
+            $this->trueName=$reciverInfo['name'];
+        }else{
+            $this->trueName=$reciverInfo['true_name'];
+        }
+        //$this->trueName=$reciverInfo['true_name'];
     }
 
     public function getReceiverInfo(){