From fafede57fc923436da4e536a86d9a5cd9834fde5 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Sun, 5 May 2019 14:44:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5:=E5=A2=9E=E5=8A=A0=E7=BB=84?=
 =?UTF-8?q?=E5=9B=A2=E7=A4=BE=E9=94=99=E8=AF=AF=E7=9A=84=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA;=20=E4=BF=AE=E6=AD=A3=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=94=B6=E6=AC=BE=E8=AE=B0=E5=BD=95=E7=9A=84=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?[=E5=9C=B0=E6=8E=A5=E4=BB=A3=E6=94=B6,=E5=9C=B0=E6=8E=A5?=
 =?UTF-8?q?=E7=A4=BE=E4=BB=A3=E6=94=B6]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trippestOrderSync/controllers/TulanduoApi.php         | 8 +++++++-
 .../third_party/trippestOrderSync/models/order_update.php | 2 +-
 .../third_party/trippestOrderSync/models/orders_model.php | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
index 4dd918a5..4c4384e0 100644
--- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
+++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
@@ -369,7 +369,7 @@ class TulanduoApi extends CI_Controller
             ,"GCI_leaveDate"  => $detail_jsonResp->orderDetail->leaveDate
             ,"GCI_createTime" => date('Y-m-d H:i:s')
         );
-        $this->Order_update->biz_groupcombineinfo_update($gci_update_column);
+        $gci_info = $this->Order_update->biz_groupcombineinfo_update($gci_update_column);
         /** GRoupInfo */
         $coli_groupcode_ht = analysis_groupCode($getInfo_byGroupCode->COLI_GroupCode);
         $groupcode_ht = $coli_groupcode_ht['cut'];
@@ -395,6 +395,12 @@ class TulanduoApi extends CI_Controller
         $new_memo = trim($detail_jsonResp->orderDetail->orderRemark)=="" ? $old_memo : $old_memo . " orderRemark\r\n" . $detail_jsonResp->orderDetail->orderRemark . "\r\n";
         $old_detail = mb_strstr($coli_orderdetailtext, " operations", true)!==false ? mb_strstr($coli_orderdetailtext, " operations", true) : $coli_orderdetailtext;
         $new_detail = trim($allDetails_to_HT)=="" ? $old_detail : $old_detail . " operations\r\n" . $allDetails_to_HT . "\r\n";
+        // 判断收款方并提示
+        $finance_memo = "";
+        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);
+        }
         // 团款总金额
         // 渠道实收
         $travel_fee = 0;
diff --git a/webht/third_party/trippestOrderSync/models/order_update.php b/webht/third_party/trippestOrderSync/models/order_update.php
index bff88fd2..8b0bd495 100644
--- a/webht/third_party/trippestOrderSync/models/order_update.php
+++ b/webht/third_party/trippestOrderSync/models/order_update.php
@@ -53,7 +53,7 @@ class Order_update extends CI_Model {
         }
         $update_str = $this->HT->update_string('GroupCombineInfo', $column_data, $this->gci_where_update);
         $update_exc = $this->HT->query($update_str);
-        return $update_exc;
+        return $this->HT->query("SELECT top 1 * from GroupCombineInfo WHERE " . $this->gci_where_update)->row();
     }
 
     /*!
diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php
index a25828f3..e241900c 100644
--- a/webht/third_party/trippestOrderSync/models/orders_model.php
+++ b/webht/third_party/trippestOrderSync/models/orders_model.php
@@ -1280,8 +1280,8 @@ class Orders_model extends CI_Model {
     public function biz_groupaccountinfo_cut($coli_sn, $paytype)
     {
       $sql = "DELETE from BIZ_GroupAccountInfo
-              WHERE GAI_COLI_SN=? AND GAI_Type=? AND GAI_Operator = 435";
-      $query = $this->HT->query($sql, array($coli_sn, $paytype));
+              WHERE GAI_COLI_SN=?  AND GAI_Operator = 435"; // AND GAI_Type=?, $paytype
+      $query = $this->HT->query($sql, array($coli_sn));
       return $query;
     }