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

application/models/Business/Order/OrderService.php

@@ -883,7 +883,7 @@ class OrderServiceModel extends \Business\AbstractModel
         if (empty($diliverymanIds)) {
             ErrorModel::throwException(CodeConfigModel::commonError);
         }
-        $qmDeliveryLogList = $qmDeliveryLogDao->getListByDeliverymanIdAndTypeCache($diliverymanIds, $type, ApiConst::pageIndex, $pageSize,array('get_time' => 'desc'),$memberId);
+        $qmDeliveryLogList = $qmDeliveryLogDao->getListByDeliverymanIdAndTypeCache($diliverymanIds, $type,$pageIndex, $pageSize,array('get_time' => 'desc'),$memberId);
         $orderIds=Array();
         foreach($qmDeliveryLogList['list'] as $qmDeliveryLog){
             if($qmDeliveryLog['orderType']==ApiConst::orderTypeRefund){

application/models/Business/Order/RefundService.php

@@ -718,7 +718,7 @@ class RefundServiceModel extends \Business\AbstractModel
         if (empty($refundReturn)) {
             ErrorModel::throwException(CodeConfigModel::notExistRefund);
         }
-        $res=$this->getStoreRefundList($storeId,$returnId);
+        $res=$this->getStoreRefundList($storeId,ApiConst::zero,ApiConst::zero,ApiConst::pageSize, $returnId);
         if(!empty($res['refundReturns'][ApiConst::zero])) {
             return $res['refundReturns'][ApiConst::zero];
         }