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

application/models/Business/Store/DeliveryService.php

@@ -41,8 +41,10 @@ class DeliveryServiceModel extends \Business\AbstractModel
         if($data['orderType']==ApiConst::orderTypeRefund){
             //如果是退货orderId就是refundId
             $orderOne=  $refundReturnDao->findByRefundId($data['orderId'],$refundReturnDao->refundDetailField);
-            $orderD= $orderDao->find($orderOne['orderId'],$orderDao->getOrderDetailField());
+            $whereOrder['order_id']=$orderOne['orderId'];
+            $orderD= $orderDao->find($whereOrder,$orderDao->getOrderDetailField());
         }else{
+            $whereOrder['order_id']=$data['orderId'];
             $orderD= $orderDao->find($data['orderId'],$orderDao->getOrderDetailField());
         }