Merge branch 'feature/plan-auto-send-release'

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);
     }
 

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);
         }