pc

application/models/Business/Order/OrderService.php

@@ -718,18 +718,19 @@ class OrderServiceModel extends \Business\AbstractModel
      */
     public function getQmDeliveryLogList($memberId, $type = ApiConst::orderTypeBuy, $pageIndex = ApiConst::pageIndex, $pageSize = ApiConst::pageSize)
     {
-        $QmDeliveryLogDao = \DAO\Order\QmDeliverymanLogModel::getInstance(DbNameConst::salveDBConnectName);
-
+        $qmDeliveryLogDao = \DAO\Order\QmDeliverymanLogModel::getInstance(DbNameConst::salveDBConnectName);
+        $qmDeliveryMan=\DAO\Order\DiliverymanModel::getInstance(DbNameConst::salveDBConnectName);
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::salveDBConnectName);
         $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);
         $memberDao = \DAO\MemberModel::getInstance(DbNameConst::salveDBConnectName);
+        $qmMans=$qmDeliveryMan->getListByMemberId($memberId);
+        $diliverymanIds=array_column($qmMans,'id');
         $diliverymanId = $memberDao->getInfo($memberId, 'diliveryman_id');
-        if (empty($diliverymanId)) {
+        if (empty($diliverymanIds)) {
             ErrorModel::throwException(CodeConfigModel::commonError);
         }
-
-        $qmDeliveryLogList = $QmDeliveryLogDao->getListByDeliverymanIdAndTypeCache($diliverymanId, $type, $pageIndex, $pageSize);
+        $qmDeliveryLogList = $qmDeliveryLogDao->getListByDeliverymanIdAndTypeCache($diliverymanIds, $type, $pageIndex, $pageSize,$memberId);
         $orderIds = array_column($qmDeliveryLogList['list'], 'orderId');
       //  echo json_encode($orderIds);exit;
        // $where['delete_state'] = ApiConst::undeleteOrder;
@@ -860,7 +861,7 @@ class OrderServiceModel extends \Business\AbstractModel
     {
         $memberDao = \DAO\MemberModel::getInstance(DbNameConst::masterDBConnectName);
         $qmDeliverymanLogDao = \DAO\Order\QmDeliverymanLogModel::getInstance(DbNameConst::masterDBConnectName);
-        $deliverymanId = $memberDao->getInfo($memberid, 'diliveryman_id');
+        //$deliverymanId = $memberDao->getInfo($memberid, 'diliveryman_id');
         $qmDeliveryManLog = $qmDeliverymanLogDao->findById($id);
         if ($qmDeliveryManLog['deliveryState'] == ApiConst::deliveryStateWait && $qmDeliveryManLog['id'] == $id) {
             $updateResult = $qmDeliverymanLogDao->updateStatusById($id);
@@ -871,7 +872,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     $push->reacheRemind($order['buyerId'], $order['orderId'], $order['orderSn']);
                 }
             $orderDao->deleteOrderCache($memberid, $qmDeliveryManLog['orderId'], $order['storeId'],true);
-            $qmDeliverymanLogDao->deleteOrderCache($deliverymanId, $id);
+            $qmDeliverymanLogDao->deleteOrderCache($memberid, $id);
             return $updateResult;
         } else {
             return false;

application/models/DAO/Order/Diliveryman.php

@@ -18,7 +18,7 @@ use Our\OrderConst;
 class DiliverymanModel extends \DAO\AbstractModel
 {
 
-
+    public $detailField='id as id,true_name as trueName,mobile as mobile,scores as scores,store_id as storeId,add_time as addTime,update_time as updateTime,member_id as memberId,bind_status as bindStatus,is_del as isDel';
     /**
      * 表名
      *
@@ -64,7 +64,16 @@ class DiliverymanModel extends \DAO\AbstractModel
         $data = $this->db->from($this->_tableName)->where($where)->fetchOne();
         return $data;
     }
-
+    //任务脚本方法
+    public function getListByMemberId($memberId)
+    {
+        $this->setDb($this->dbName);
+        $where['member_id']=$memberId;
+        $where['is_del']=ApiConst::zero;
+        $where = $this->db->getSqlWhereByArray($where);
+        $list = $this->db->select($this->detailField)->from($this->_tableName)->where($where)->fetchAll();
+        return $list;
+    }
     public function findById($id)
     {
         $this->setDb($this->dbName);

application/models/DAO/Order/QmDeliverymanLog.php

@@ -88,19 +88,24 @@ class QmDeliverymanLogModel extends \DAO\AbstractModel
     public function getListByDeliverymanIdAndType($diliveryId, $type, $pageIndex, $pageSize, $order = array('get_time' => 'desc'))
     {
         $this->setDb($this->dbName);
-        $where['diliveryman_id'] = $diliveryId;
+        $where['diliveryman_id'] =array('in',$diliveryId);
+
         if ($type == ApiConst::orderTypeBuy) {
             $where['order_type'] = ApiConst::orderTypeBuy;
             $where['delivery_state'] = ApiConst::deliveryStateWait;
         }
         if ($type == ApiConst::orderTypeRefund) {
-            $where=Common::format(" diliveryman_id={0} and order_type={1} and (delivery_state={2} or delivery_state={3})",$diliveryId,ApiConst::orderTypeRefund,ApiConst::deliveryStateWait,ApiConst::deliveryStateWaitTen);
-//            $where['order_type'] = ApiConst::orderTypeRefund;
-//            $where['delivery_state'] = ApiConst::deliveryStateWait;
+          //  $where=Common::format(" diliveryman_id in ({0}) and order_type={1} and (delivery_state={2} or delivery_state={3})",$diliveryId,ApiConst::orderTypeRefund,ApiConst::deliveryStateWait,ApiConst::deliveryStateWaitTen);
+            $where['order_type'] = ApiConst::orderTypeRefund;
+            $where['delivery_state'] = ApiConst::deliveryStateWait;
         }
         if ($type == ApiConst::deliveryStateWait) {
             $where['delivery_state'] = ApiConst::deliveryStateComplete;
         }
+        if(is_array($where)){
+            $where=$this->db->getSqlWhereByArray($where);
+        }
+
         if($type==ApiConst::deliveryStateComplete){
             $order = array('finish_time' => 'desc');
         }
@@ -108,9 +113,9 @@ class QmDeliverymanLogModel extends \DAO\AbstractModel
         return $list;
     }
 
-    public function getListByDeliverymanIdAndTypeCache($diliveryId, $type, $pageIndex, $pageSize, $order = array('get_time' => 'desc'))
+    public function getListByDeliverymanIdAndTypeCache($diliveryId, $type, $pageIndex, $pageSize, $order = array('get_time' => 'desc'),$memberId)
     {
-        return \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getListByDeliverymanIdAndType'), array($diliveryId, $type, $pageIndex, $pageSize, $order), ApiConst::oneDaySecond, array($diliveryId));
+        return \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getListByDeliverymanIdAndType'), array($diliveryId, $type, $pageIndex, $pageSize, $order), ApiConst::oneDaySecond, array($memberId));
     }
 
     /**

conf/application.ini

@@ -219,7 +219,7 @@ push.open=1
 [ccwdevelop : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "192.168.1.201"
+resources.database.params.hostname = "127.0.0.1"
 resources.database.params.port     = 3306
 resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
@@ -229,7 +229,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "192.168.1.201"
+resources.database.slave.params.hostname = "127.0.0.1"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"