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

application/library/Order/OrderConfirmUtil.php

@@ -1052,7 +1052,7 @@ class OrderConfirmUtil {
         $reciverInfo['mob_phone'] = $addressInfo['mob_phone'];
         $reciverInfo['tel_phone'] = $addressInfo['tel_phone'];
         $reciverInfo['address'] = $addressInfo['area_info'].' '.$addressInfo['address'];
-        $reciverInfo['name'] = $addressInfo['name'];
+        $reciverInfo['name'] = $addressInfo['true_name'];
         $reciverInfo['area'] = $addressInfo['area_info'];
         $reciverInfo['street'] = $addressInfo['address'];
         $reciverInfo['lng'] = $addressInfo['lng'];

application/models/Business/Order/RefundService.php

@@ -84,7 +84,7 @@ class RefundServiceModel extends \Business\AbstractModel
      */
     public function setReceiveTime($storeId, $refundId, $receiveTime) {
         if($receiveTime < TIMESTAMP){
-            ErrorModel::throwException(CodeConfigModel::commonError);
+            ErrorModel::throwException(CodeConfigModel::beyondRecieverTime);
         }
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
         $storeDao=\DAO\StoreModel::getInstance(DbNameConst::masterDBConnectName);
@@ -674,7 +674,7 @@ class RefundServiceModel extends \Business\AbstractModel
 //                $value['couponAmount'] = ($value['goodsAmount'] + $value['shippingFee']) - $value['orderAmount'];//优惠券金额
 //                $value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount'];
                 // $value['orderAmount'] = $value['orderAmount'];
-                $value['reciverInfo'] = unserialize($orderCommons['reciverInfo']);
+                $value['reciverInfo'] = unserialize($orderCommons[$value['orderId']]['reciverInfo']);
                 $value['dlyoPickupCode'] = substr($value['orderSn'], ApiConst::positionPickupCodeBegin);
                 $value['deliveryTimeEnd'] = $value['deliveryTime'] + ApiConst::arriveTimeRadius;
                 $value['goodsImage'] = ImageUtil::getGoodsImgUrl($value['goodsImage'], ApiConst::goodsSmallSize);
@@ -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(){

application/models/Error/CodeConfig.php

@@ -322,6 +322,7 @@ class CodeConfigModel
     const updateRefundStateNameFail=300141;
     const refundMoneyError=300142;
     const refundWriteError=300143;
+    const beyondRecieverTime=300144;
     //店铺相关错误码
 
     //商品分类
@@ -825,6 +826,7 @@ class CodeConfigModel
             self::updateRefundStateNameFail=>'更新order表refund_state_name失败',
             self::refundMoneyError=>'退款失败',
             self::refundWriteError=>'退款表写入失败',
+            self::beyondRecieverTime=>'设置收货时间不能早于当前时间',
             //销售员
             self::emptySaleGoodsId => '商品id不能为空',
             self::emptySaleGoods => '销售商品不存在',