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

application/models/Business/Order/OrderService.php

@@ -292,10 +292,17 @@ class OrderServiceModel extends \Business\AbstractModel
             $returnData['diliverymanId'] = ApiConst::zero;
             $returnData['deliveryman'] = new \stdClass();
         }
-        $returnData['offlinePayway']=$storeDao->convertOfflinePayway($returnData['offlinePayway']);
+        if(!in_array($this->order['paymentType'],ArrayConst::payTypeOnlines)){
+            $returnData['offlinePayway']=$storeDao->convertOfflinePayway($this->store['offlinePayway']);
+        }else{
+            $returnData['offlinePayway']=new \stdClass();
+        }
+        if(CURRENTVERSION!=NameConst::versionOne){
+            $returnData['offlinePayway']='';
+        }
         $returnData['storeMemberId']=$this->store['memberId'];
         $returnData['totalGoodsNum'] = $orderGoodsDao->getGoodsCount($this->orderGoodsList);
-        $returnData['offlinePayway'] = $this->store['offlinePayway'] ? $this->store['offlinePayway'] : '';
+       // $returnData['offlinePayway'] = $this->store['offlinePayway'] ? $this->store['offlinePayway'] : '';
         $this->address['address']=$orderCommonDao->convertReceiveAddress($this->address['address']);
         $returnData['reciverInfo'] = $this->address;
         $returnData['reciverInfo']['mobPhone']=!empty($returnData['reciverInfo']['mobPhone'])?$returnData['reciverInfo']['mobPhone']:'';

application/models/DAO/Store.php

@@ -38,14 +38,20 @@ class StoreModel extends \DAO\AbstractModel
 
     public function convertOfflinePayway($offlinPayway)
     {
-        $res = new \stdClass();
-//        $res['images'] = Array();
-//        $res['payway'] = '';
+
         if (!empty($offlinPayway)) {
             $offlinPayway=unserialize($offlinPayway);
-            $res['images']=$offlinPayway['images'];
+            $res['images']=[];
+            foreach($offlinPayway['images'] as $image){
+                $image= \Our\Common::getStaticFile($image, \Our\ImageConst::storeLabel);
+                array_push($res['images'],$image);
+            }
+
             $res['payway']=$offlinPayway['payway']?$offlinPayway['payway']:'';
         }
+        if(empty($res)){
+            $res=new \stdClass();
+        }
         return $res;
     }