pc

application/models/Business/Order/OrderService.php

@@ -702,19 +702,21 @@ class OrderServiceModel extends \Business\AbstractModel
         $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance(DbNameConst::salveDBConnectName);
         $memberDao = \DAO\MemberModel::getInstance(DbNameConst::salveDBConnectName);
         $diliverymanId = $memberDao->getInfo($memberId, 'diliveryman_id');
+        $diliverymanId=46;
         if (empty($diliverymanId)) {
             ErrorModel::throwException(CodeConfigModel::commonError);
         }
 
         $qmDeliveryLogList = $QmDeliveryLogDao->getListByDeliverymanIdAndTypeCache($diliverymanId, $type, $pageIndex, $pageSize);
         $orderIds = array_column($qmDeliveryLogList['list'], 'orderId');
-        $where['delete_state'] = ApiConst::undeleteOrder;
-        //$orderIds=implode(',',$orderIds);
-        $where['order_id'] = array('in', $orderIds);
-        $where['lock_state'] = ApiConst::zero;
+      //  echo json_encode($orderIds);exit;
+       // $where['delete_state'] = ApiConst::undeleteOrder;
+        $orderIds=implode(',',$orderIds);
+        $where =Common::format(" order_id in({0})",$orderIds);
+       // $where['lock_state'] = ApiConst::zero;
 
         //获得订单列表
-        //$orders=$orderDao->getList($where, $this->orderField, $pageIndex, $pageSize, $order = array('add_time' => 'desc'));
+     //  $orders=$orderDao->getList($where, $this->orderField, $pageIndex, $pageSize, $order = array('add_time' => 'desc'));
          $orders = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, $this->orderField, $pageIndex, $pageSize, $order = array('add_time' => 'desc')), \Our\ApiConst::oneDaySecond, array($diliverymanId));
         $goodsDao = \DAO\GoodsModel::getInstance();
         $orderIds = array_column($orders['list'], 'orderId');
@@ -743,7 +745,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 $delivery['lat'] = $delivery['reciverInfo']['lat'] ? $delivery['reciverInfo']['lat'] : 0.0;
                 $delivery['subAddress'] = isset($delivery['reciverInfo']['sub_address']) ? $delivery['reciverInfo']['sub_address'] : '';
                 unset($delivery['goodsAmount']);
-                unset($delivery['orderState']);
+               // unset($delivery['orderState']);
                 unset($delivery['refundState']);
                 unset($delivery['goodsAmount']);
                 unset($delivery['reciverInfo']);