From 736b5b6b04ba38f1866427fff2084844c2fb4fac Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Tue, 28 May 2019 14:12:09 +0800
Subject: [PATCH] =?UTF-8?q?Trippest=E5=90=8C=E6=AD=A5:=E8=87=AA=E8=90=A5?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=B6=E6=AC=BE=E6=96=B9=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/trippestOrderSync/controllers/TulanduoApi.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
index ba83d1d4..dc30bcc4 100644
--- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
+++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
@@ -400,6 +400,9 @@ class TulanduoApi extends CI_Controller
         if (intval($coli_opi_id) === 435 && in_array($gci_info->GCI_FromAgc, array("D目的地桂林组", "Trippest"))) {
             $finance_memo .= "备注: 本订单组团社是渠道, 账单收款方应为地接社代收, 同步回来却是Trippest自营, 请注意核对.\r\n";
             $new_memo .= mb_strstr($new_memo, "orderRemark", true)!==false ? $finance_memo : ("orderRemark " . $finance_memo);
+        } else if (intval($coli_opi_id) !== 435 && ! in_array($gci_info->GCI_FromAgc, array("D目的地桂林组", "Trippest"))) {
+            $finance_memo .= "备注: 本订单是自营团, 账单收款方应为海纳收款, 同步得到结果是桂林海纳分销渠道, 请注意核对.\r\n";
+            $new_memo .= mb_strstr($new_memo, "orderRemark", true)!==false ? $finance_memo : ("orderRemark " . $finance_memo);
         }
         // 团款总金额
         // 渠道实收