From 5828e39573a36534ba61c263867ac784a0e72e56 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 5 Sep 2019 09:28:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20Trippest=E8=87=AA=E5=8A=A8=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E8=B4=A6=E5=8D=95:=E6=88=90=E6=9C=AC=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E7=9A=84=E5=9B=A2=E5=8F=B7=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/trippestOrderSync/controllers/vendor_money.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webht/third_party/trippestOrderSync/controllers/vendor_money.php b/webht/third_party/trippestOrderSync/controllers/vendor_money.php
index 100f1b00..7bde868e 100644
--- a/webht/third_party/trippestOrderSync/controllers/vendor_money.php
+++ b/webht/third_party/trippestOrderSync/controllers/vendor_money.php
@@ -338,6 +338,7 @@ class Vendor_money extends CI_Controller {
                     $row_tmp[$col_mean] = $val;
                 }
                 if (isset($row_tmp['group_name']) && !empty($row_tmp['group_name'])) {
+                    $row_tmp['group_name'] = trim_str(trim($row_tmp['group_name']));
                     $xls_data[] = $row_tmp;
                 }
             }

From b4f9528346795150a70c235a3fd544f4c9eff2f1 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 5 Sep 2019 09:33:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Trippest=E8=87=AA=E5=8A=A8=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E8=B4=A6=E5=8D=95,=E5=91=A8=E6=9C=9F=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trippestOrderSync/controllers/TulanduoApi.php      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
index 903c6b15..784c1ee1 100644
--- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
+++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
@@ -734,11 +734,11 @@ class TulanduoApi extends CI_Controller
         $output_text = "Got order operations from TuLanDuo:" . $detail_jsonResp->orderDetail->orderId . ". " . $coli_id;
         log_message('error', $output_text);
         echo $output_text;
-        // if (strval($order->isHistory) === '1') {
-        //     require_once('order_finance.php');
-        //     $vendor_class = new Order_finance();
-        //     $vendor_class->single_order_report($coli_sn);
-        // }
+        if (strval($order->isHistory) === '1') {
+            require_once('order_finance.php');
+            $vendor_class = new Order_finance();
+            $vendor_class->single_order_report($coli_sn);
+        }
         return;
     }