Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/controllers/TulanduoApi.php

@@ -248,11 +248,11 @@ class TulanduoApi extends CI_Controller
         $detail_jsonResp->orderDetail->agcOrderNo = (trim($detail_jsonResp->orderDetail->agcOrderNo)); // 去掉中文的全角空格
         // 目的地的团已经主动取消, 只有其他渠道的团需要更新状态
         if (mb_strstr($detail_jsonResp->orderDetail->agcOrderNo, "取消") !== false) {
-            $this->plan_cancel($order->GCI_VendorOrderId);
+            // $this->plan_cancel($order->GCI_VendorOrderId);
             if (intval($order->COLI_OPI_ID) === 435) {
                 $this->order_cancel($order->COLI_ID);
             }
-            return;
+            // return;
         }
         $allDetails_to_HT = "";
         $allDetails_to_HT .= "\r\n日程: ";