From 8f09ca118475b05fb3c672509d6b9e446e8bc14e Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Sun, 18 Aug 2019 21:12:50 +0800
Subject: [PATCH] =?UTF-8?q?Trippest=E5=90=8C=E6=AD=A5:=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=B8=A0=E9=81=93=E6=80=BB=E5=AE=9E=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
index 2f281937..0be259a1 100644
--- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
+++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
@@ -359,6 +359,16 @@ class TulanduoApi extends CI_Controller
                 $this->order_cancel($order->COLI_ID);
             }
         }
+        // 团款总金额
+        // 渠道实收
+        $travel_fee = 0;
+        $travel_fee_currency = 'RMB';
+        if (isset($detail_jsonResp->orderDetail->travelFees) ) {
+            foreach ($detail_jsonResp->orderDetail->travelFees as $ktf => $vtf) {
+                $travel_fee = bcadd($travel_fee, $vtf->sumMoney);
+            }
+            unset($vtf);
+        }
         /** groupcombineinfo */
         $this->Order_update->gci_where_update = " GCI_VendorOrderId='" . $detail_jsonResp->orderDetail->orderId . "' and GCI_VEI_SN in (" . implode(',', $this->vendor_ids) . ")"; // 不明确指定供应商id,出现过不对应的情况
         $gci_update_column = array(
@@ -368,6 +378,7 @@ class TulanduoApi extends CI_Controller
             ,"GCI_travelDate" => $detail_jsonResp->orderDetail->travelDate
             ,"GCI_leaveDate"  => $detail_jsonResp->orderDetail->leaveDate
             ,"GCI_createTime" => date('Y-m-d H:i:s')
+            ,"GCI_priceCNY"   => $travel_fee
         );
         $gci_info = $this->Order_update->biz_groupcombineinfo_update($gci_update_column);
         /** GRoupInfo */
@@ -404,16 +415,6 @@ class TulanduoApi extends CI_Controller
             $finance_memo .= "备注: 本订单是自营团, 账单收款方应为海纳收款, 同步得到结果是桂林海纳分销渠道, 请注意核对.\r\n";
             $new_memo .= mb_strstr($new_memo, "orderRemark", true)!==false ? $finance_memo : ("orderRemark " . $finance_memo);
         }
-        // 团款总金额
-        // 渠道实收
-        $travel_fee = 0;
-        $travel_fee_currency = 'RMB';
-        if (isset($detail_jsonResp->orderDetail->travelFees) ) {
-            foreach ($detail_jsonResp->orderDetail->travelFees as $ktf => $vtf) {
-                $travel_fee = bcadd($travel_fee, $vtf->sumMoney);
-            }
-            unset($vtf);
-        }
         // 渠道价
         $partner_fee = 0;
         $partner_fee_currency = 'RMB';