From 403f42a34f5d0c7465fb2d23ed7e701ff8116f95 Mon Sep 17 00:00:00 2001 From: lyt Date: Thu, 2 Aug 2018 10:08:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=9B=BE=E5=85=B0=E6=9C=B5?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0,?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/TulanduoApi.php | 28 ++++++++++++------- .../models/TuLanDuo_queryContentBuilder.php | 11 ++++++++ 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index 533fc820..f5834f7c 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -74,9 +74,9 @@ class TulanduoApi extends CI_Controller * 获取订单列表 * @date 2018-05-02 */ - public function get_orderlist() + public function get_orderlist($order_number=null) { - $order_number = $this->input->get_post("orderNum"); + // $order_number = $this->input->get_post("orderNo"); $startOrderDate = date('Y-m-d', strtotime("-2 days")); $endOrderDate = date('Y-m-d'); $startTravelDate = date('Y-m-d'); @@ -85,15 +85,19 @@ class TulanduoApi extends CI_Controller ->setKey($this->key) ->setPageSize(20) ->setPageIndex(1) ; - $get_type = rand(0, 1); // 需要按预定时间和出发时间, 避免有漏的 - if ($get_type === 0) { - log_message('error','get_orderlist From TuLanDuo By travel Date' ); - $this->tld_order->setStartTravelDate($startTravelDate) - ->setEndTravelDate($endTravelDate) ; + if ( ! empty($order_number)) { + $this->tld_order->setAgcOrderNo($order_number); } else { - log_message('error','get_orderlist From TuLanDuo By order Date' ); - $this->tld_order->setStartOrderDate($startOrderDate) - ->setEndOrderDate($endOrderDate) ; + $get_type = rand(0, 1); // 需要按预定时间和出发时间, 避免有漏的 + if ($get_type === 0) { + log_message('error','get_orderlist From TuLanDuo By travel Date' ); + $this->tld_order->setStartTravelDate($startTravelDate) + ->setEndTravelDate($endTravelDate) ; + } else { + log_message('error','get_orderlist From TuLanDuo By order Date' ); + $this->tld_order->setStartOrderDate($startOrderDate) + ->setEndOrderDate($endOrderDate) ; + } } $resp = $this->excute_curl($this->list_url, $this->tld_order); $resp_arr = json_decode($resp, true); @@ -101,6 +105,10 @@ class TulanduoApi extends CI_Controller log_message('error','TulanduoApi get_orderlist failed. Msg:' . $resp_arr['errMsg'] . "; Request: " . ($this->tld_order->getBizContent())); return; } + if ($resp_arr["responseData"]["totalRows"] == 0) { + log_message('error','TulanduoApi get_orderlist 0. '); + return; + } $all_list = $resp_arr["responseData"]["orders"]; $order_to_HT = array_map( function($ele){ diff --git a/webht/third_party/trippestOrderSync/models/TuLanDuo_queryContentBuilder.php b/webht/third_party/trippestOrderSync/models/TuLanDuo_queryContentBuilder.php index 153a3e9b..22ea575e 100644 --- a/webht/third_party/trippestOrderSync/models/TuLanDuo_queryContentBuilder.php +++ b/webht/third_party/trippestOrderSync/models/TuLanDuo_queryContentBuilder.php @@ -125,6 +125,17 @@ class TuLanDuo_queryContentBuilder extends CI_Model $this->bizContentarr['orderId'] = $orderId; return $this; } + + public function getAgcOrderNo() + { + return $this->agcOrderNo; + } + public function setAgcOrderNo($agcOrderNo) + { + $this->agcOrderNo = $agcOrderNo; + $this->bizContentarr['agcOrderNo'] = $agcOrderNo; + return $this; + } // 其他还没用到先不写了... }