From cd4a2535511a0888db74a3769ab03f658a897534 Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 17 Jun 2019 11:51:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=8F=91=E9=80=81=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E5=9B=A2=E6=8C=87=E5=AE=9A=E5=9C=B0=E6=8E=A5=E7=A4=BE?= =?UTF-8?q?=E7=9A=84=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/vendorPlanSync/controllers/index.php | 4 ++-- webht/third_party/vendorPlanSync/libraries/Tulanduo.php | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/webht/third_party/vendorPlanSync/controllers/index.php b/webht/third_party/vendorPlanSync/controllers/index.php index 2506ad81..0feb4228 100644 --- a/webht/third_party/vendorPlanSync/controllers/index.php +++ b/webht/third_party/vendorPlanSync/controllers/index.php @@ -24,9 +24,9 @@ class Index extends CI_Controller { * * 使用供应商平台登陆账号获取接口的key */ - public function index($GRI_SN=0) + public function index($GRI_SN=0, $vendor=null) { - $auto_vendor_str = implode(",", $this->vendor->auto_vendor); + $auto_vendor_str = $vendor===null ? implode(",", $this->vendor->auto_vendor) : $vendor; return $this->push($GRI_SN, $auto_vendor_str); } diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php index 0f04a6b0..fe2d8703 100644 --- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php +++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php @@ -128,7 +128,6 @@ class Tulanduo $grd_apart_info = $this->tour_apart($grd_info); $big_order_index = 0; $expect_order_cnt = count($grd_apart_info['com'])+intval(!empty($grd_apart_info['big_pvt']))+intval(!empty($grd_apart_info['pvt'])); -// echo json_encode($grd_info);exit; foreach ($grd_apart_info as $group_key => $grd_a) { $big_order_index = $this->tour_apart_order_exec($group_key, $vas, $request_info, $guestlist, $grd_a, $big_order_index); }