orderDetail

application/models/Business/Order/OrderService.php

@@ -231,7 +231,7 @@ class OrderServiceModel extends \Business\AbstractModel
      */
     public function getOrderDetail($orderId)
     {
-       // error_reporting(E_ALL);
+       error_reporting(E_ALL);
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
         $addressDao = \DAO\AddressModel::getInstance(DbNameConst::salveDBConnectName);
         $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);
@@ -240,7 +240,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $storeDao = \DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
         $goodsDao = \DAO\GoodsModel::getInstance(DbNameConst::salveDBConnectName);
         //订单
-        $order = \Our\RedisHelper::cachedFunction(\Redis\Db6\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond,array($orderId));
+        $order = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'findByOrderId'), array($orderId), \Our\ApiConst::oneDaySecond,array($orderId));
         if(!$order){
             ErrorModel::throwException(CodeConfigModel::orderNotExist);
         }
@@ -268,7 +268,7 @@ class OrderServiceModel extends \Business\AbstractModel
         //商店相关信息
 //         $this->store=$storeDao->get($this->order['storeId']);
 //        $this->store=Common::convertUnderline($this->store[0]);
-         $this->store = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($this->order['storeId'], $storeDao->detailField), \Our\ApiConst::sevenDaySecond,array($this->order['storeId']));
+         $this->store = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($this->order['storeId'], $storeDao->detailField), \Our\ApiConst::sevenDaySecond,array($this->order['storeId']));
         $returnData = $this->order;
         //配送员信息
         $this->diliveryman = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$diliverymanDao, 'findById'), array($returnData['diliverymanId']), \Our\ApiConst::oneDaySecond);
@@ -292,9 +292,18 @@ 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']:'';

application/models/Business/Order/RefundService.php

@@ -415,7 +415,7 @@ class RefundServiceModel extends \Business\AbstractModel
         if($type==ApiConst::refundSellerVerify){
             $where=$refundReturnDao->getProccessOrderBySeller($storeId);
         }
-        if($type){
+        if($type==ApiConst::refundSellerAgree){
             $where=$refundReturnDao->getReturnWaitReceive($storeId);
             $order= array('receive_time'=> 'asc');
         }