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

application/models/Business/Order/OrderService.php

@@ -1291,7 +1291,7 @@ class OrderServiceModel extends \Business\AbstractModel
         $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);
         $refundReturnDao=\DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
         $memberDao = \DAO\MemberModel::getInstance(DbNameConst::salveDBConnectName);
-        $qmMans=$qmDeliveryMan->getListByMemberId($memberId);
+        $qmMans=$qmDeliveryMan->getListByMemberId($memberId,true);
         $diliverymanIds=array_column($qmMans,'id');
         $diliverymanId = $memberDao->getInfo($memberId, 'diliveryman_id');
         if (empty($diliverymanIds)) {
@@ -1379,7 +1379,7 @@ class OrderServiceModel extends \Business\AbstractModel
             $returnData['totalCount'] = $orders['totalCount'];
             return $returnData;
         } else {
-            return new \stdClass();
+            return array('orders'=>array(),'totalCount'=>ApiConst::zero);
         }
 
     }

application/models/DAO/Order/Diliveryman.php

@@ -49,12 +49,15 @@ class DiliverymanModel extends \DAO\AbstractModel
         $data = $this->db->from($this->_tableName)->select($this->detailField)->where($where)->fetchOne();
         return $data;
     }
+
     //任务脚本方法
-    public function getListByMemberId($memberId)
+    public function getListByMemberId($memberId,$isClient=false)
     {
         $this->setDb($this->dbName);
         $where['member_id']=$memberId;
+        if(!$isClient){
             $where['is_del']=ApiConst::zero;
+        }
         $where = $this->db->getSqlWhereByArray($where);
         $list = $this->db->select($this->detailField)->from($this->_tableName)->where($where)->fetchAll();
         return $list;