From 67003cdb8c9e4159e0350ac2a5bd17d584283891 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Tue, 20 Nov 2018 10:03:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E8=A1=A8:=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E6=94=B6=E5=85=A5=E8=AE=A1=E5=85=A5=E6=94=B6=E5=85=A5,?=
 =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E6=88=90=E6=9C=AC;=E6=8E=A5?=
 =?UTF-8?q?=E9=80=81=E4=BF=A1=E6=81=AF=E5=8F=96=E5=9B=BE=E5=85=B0=E6=9C=B5?=
 =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/TulanduoApi.php               | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
index a6862973..811968b7 100644
--- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
+++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
@@ -445,7 +445,7 @@ class TulanduoApi extends CI_Controller
         $COLD_MemoText = raw_json_encode(array("Pick up"=>$detail_jsonResp->orderDetail->toTraffic, "Drop off"=>$detail_jsonResp->orderDetail->backTraffic));
         $new_memotext = trim($cold_memotext)===""||(json_decode($cold_memotext)!==null&&!is_numeric(json_decode($cold_memotext))) ? $COLD_MemoText : $cold_memotext;
         $cold_update_column = array(
-            "COLD_MemoText" => $new_memotext
+            "COLD_MemoText" => $COLD_MemoText
         );
         if (intval($coli_opi_id)===435) {
             $cold_update_column['COLD_MemoText']    = $COLD_MemoText;
@@ -634,26 +634,26 @@ class TulanduoApi extends CI_Controller
             }
         }
         // 其他收入
-        if (isset($detail_jsonResp->orderDetail->operationDetails->otherReceives) ) {
-            foreach ($detail_jsonResp->orderDetail->operationDetails->otherReceives as $vor) {
-                $this->Orders_model->GCOD_GCI_combineNo = $detail_jsonResp->orderDetail->groupOrderNo ;
-                $this->Orders_model->GCOD_VEI_SN        = $vei_SN;
-                $this->Orders_model->GCOD_operationType = "otherReceives";
-                $this->Orders_model->GCOD_subType       = $vor->type;
-                $this->Orders_model->GCOD_title         = "";
-                $this->Orders_model->GCOD_dutyName      = "";
-                $this->Orders_model->GCOD_dutyTel       = "";
-                $this->Orders_model->GCOD_dutyPhoto     = '';
-                $this->Orders_model->GCOD_startDate     = "";
-                $this->Orders_model->GCOD_endDate       = "";
-                $this->Orders_model->GCOD_sumMoney      = $vor->sumMoney;
-                $this->Orders_model->GCOD_carLicense    = "";
-                $this->Orders_model->GCOD_standard      = "";
-                $this->Orders_model->GCOD_remark        = $vor->remark;
-                $this->Orders_model->GCOD_useNum        = $vor->useNum;
-                $this->Orders_model->biz_groupcombineoperationdetail_save();
-            }
-        }
+        // if (isset($detail_jsonResp->orderDetail->operationDetails->otherReceives) ) {
+        //     foreach ($detail_jsonResp->orderDetail->operationDetails->otherReceives as $vor) {
+        //         $this->Orders_model->GCOD_GCI_combineNo = $detail_jsonResp->orderDetail->groupOrderNo ;
+        //         $this->Orders_model->GCOD_VEI_SN        = $vei_SN;
+        //         $this->Orders_model->GCOD_operationType = "otherReceives";
+        //         $this->Orders_model->GCOD_subType       = $vor->type;
+        //         $this->Orders_model->GCOD_title         = "";
+        //         $this->Orders_model->GCOD_dutyName      = "";
+        //         $this->Orders_model->GCOD_dutyTel       = "";
+        //         $this->Orders_model->GCOD_dutyPhoto     = '';
+        //         $this->Orders_model->GCOD_startDate     = "";
+        //         $this->Orders_model->GCOD_endDate       = "";
+        //         $this->Orders_model->GCOD_sumMoney      = $vor->sumMoney;
+        //         $this->Orders_model->GCOD_carLicense    = "";
+        //         $this->Orders_model->GCOD_standard      = "";
+        //         $this->Orders_model->GCOD_remark        = $vor->remark;
+        //         $this->Orders_model->GCOD_useNum        = $vor->useNum;
+        //         $this->Orders_model->biz_groupcombineoperationdetail_save();
+        //     }
+        // }
         if (isset($detail_jsonResp->orderDetail->operationDetails->trafficOperations)) {
             foreach ($detail_jsonResp->orderDetail->operationDetails->trafficOperations as $vto) {
                 $this->Orders_model->GCOD_GCI_combineNo = $detail_jsonResp->orderDetail->groupOrderNo ;