店铺获取问题

application/models/Business/Order/OrderService.php

@@ -292,17 +292,9 @@ class OrderServiceModel extends \Business\AbstractModel
             $returnData['diliverymanId'] = ApiConst::zero;
             $returnData['deliveryman'] = new \stdClass();
         }
-        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']:'';
@@ -1035,7 +1027,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 break;
             } else if (($order['payment_type'] == \Our\ApiConst::payOffline||$order['payment_type'] == \Our\ApiConst::payAog) && $order['order_state'] == \Our\ApiConst::orderStateWaitConfirm) {//已下单的待线上支付订单
                 $orderTips = \Our\DescribeConst::addOrderSuccessTips;
-                $store = $storeDao->get($storeId,false);
+                $store = $storeDao->get($order['store_id'],false);
                 $orderContent['storeName'] = $store['store_name'];
                 if ($order['payment_type'] == \Our\ApiConst::payOffline) {
                     $orderContent['imageUrls'] = array();