pc

application/library/Our/ArrayConst.php

@@ -130,7 +130,11 @@ class ArrayConst
             'buttonId'=>ApiConst::messageButtonIdOne
         ),
     );
-
+    const defaultDeliveryMan=array(
+        'id'=>0,
+        'trueName'=>'配送员a',
+        'mobile'=>'18650329907',
+    );
     const messageOrderButtonsType=array(
         0,1,2
     );

application/models/Business/Order/RefundService.php

@@ -4,6 +4,7 @@ namespace Business\Order;
 
 use Error\CodeConfigModel;
 use Error\ErrorModel;
+use OSS\OssClient;
 use Our\ApiConst;
 use Our\ArrayConst;
 use Our\Common;
@@ -356,8 +357,19 @@ class RefundServiceModel extends \Business\AbstractModel
             $refundArray['reason_info'] = $refundReasonList[$reasonId]['reasonInfo'];
         }
         $picArray = array();
+        $picArray['buyer']=array();
         if (!empty($refund['images'])) {
-            $picArray['buyer'] = $refund['images'];
+            foreach($refund['images'] as $key=>$image){
+               $ismuch= preg_match('/^(data:\s*image\/(\w+);base64,)/', $image, $result);
+                if($ismuch){
+                    $fileName=ImageUtil::uploadBase64Image($image,ImageConst::refund,ImageUtil::getFileName($memberId.$key));
+                    $fileName=basename($fileName);
+                }else{
+                    $fileName=$image;
+                }
+                array_push($picArray['buyer'],$fileName);
+            }
+          //  $picArray['buyer'] = $refund['images'];
         } else {
             $picArray['buyer'] = array();
         }
@@ -399,6 +411,7 @@ class RefundServiceModel extends \Business\AbstractModel
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance();
         $goodsDao = \DAO\GoodsModel::getInstance();
         $refundReturn = $refundReturnDao->findByRefundId($returnId, $this->refundReturnField);
+        $diliveryManDao=\DAO\Order\DiliverymanModel::getInstance(DbNameConst::salveDBConnectName);
         if (empty($refundReturn)) {
             ErrorModel::throwException(CodeConfigModel::notExistRefund);
         }
@@ -408,8 +421,10 @@ class RefundServiceModel extends \Business\AbstractModel
         $refundReturn['sellerStateName'] = ArrayConst::sellerState[$refundReturn['sellerState']];
         $refundReturn['refundTypeName'] = ArrayConst::refundType[$refundReturn['refundType']];
         $refundReturn['returnTypeName'] = ArrayConst::returnType[$refundReturn['returnType']];
-        $refundReturn['picInfo'] = unserialize($refundReturn['picInfo']);
+        $refundReturn['picInfo'] =!empty($refundReturn['picInfo'])?unserialize($refundReturn['picInfo']):array();
+        if(!empty($refundReturn['picInfo'])){
             $refundReturn['picInfo'] = $refundReturnDao->getRefundPics($refundReturn['picInfo']['buyer']);
+        }
         //平台操作类型
         $refundReturn['platformStateName'] = ArrayConst::platformState[$refundReturn['platformState']];
        $refundReturn['refundShippingTypeName'] = ArrayConst::refundShippingType[$refundReturn['refundShippingType']]['name'];
@@ -430,6 +445,25 @@ class RefundServiceModel extends \Business\AbstractModel
         }
         $info['canPlatformIn'] = $refundReturnDao->isPlatformIn($info) ? ApiConst::one : ApiConst::zero;
         $info['canSendShippingType'] = $refundReturnDao->checkIsAddReturnShipping($info) ? ApiConst::one : ApiConst::zero;
+        if($info['refundShippingType']==ApiConst::bySeller){
+            if(!$info['diliverymanId']){
+                $info['diliveryman']=ArrayConst::defaultDeliveryMan;
+            }else{
+                $diliveryMan=$diliveryManDao->findById($info['diliverymanId']);
+                if(!empty($diliveryMan)){
+                    $diliveryMan=array(
+                        'id'=>$diliveryMan['id'],
+                        'trueName'=>$diliveryMan['true_name'],
+                        'mobile'=>$diliveryMan['mobile'],
+                    );
+                    $info['diliveryman']=$diliveryMan;
+                }else{
+                    $info['diliveryman']=new \stdClass();
+                }
+            }
+        }else{
+            $info['diliveryman']=new \stdClass();
+        }
         if (!$refundReturn) {
             ErrorModel::throwException(CodeConfigModel::orderError);
         } else {