From ca16566b83a7c7cef56eed631f74934cd96f4184 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 21 Aug 2019 09:24:47 +0800
Subject: [PATCH] =?UTF-8?q?Trippest:=E8=AE=B0=E5=BD=95=E5=9C=B0=E6=8E=A5?=
 =?UTF-8?q?=E4=BB=A3=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, 15 insertions(+), 6 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
index 7c551438..903c6b15 100644
--- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
+++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
@@ -369,16 +369,25 @@ class TulanduoApi extends CI_Controller
             }
             unset($vtf);
         }
+        // 地接代收
+        $agency_receipt = 0;
+        if (isset($detail_jsonResp->orderDetail->replaceCollections) ) {
+            foreach ($detail_jsonResp->orderDetail->replaceCollections as $krc => $vrc) {
+                $agency_receipt = bcadd($agency_receipt, $vrc->money);
+            }
+            unset($vrc);
+        }
         /** 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(
             "GCI_combineNo"   => isset($detail_jsonResp->orderDetail->groupOrderNo) ? trim_str($detail_jsonResp->orderDetail->groupOrderNo) : null
-            ,"GCI_VEI_SN"     => $vei_SN
-            ,"GCI_GRI_SN"     => $groupSN
-            ,"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_VEI_SN"        => $vei_SN
+            ,"GCI_GRI_SN"        => $groupSN
+            ,"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_agencyReceipt" => $agency_receipt
         );
         $gci_info = $this->Order_update->biz_groupcombineinfo_update($gci_update_column);
         /** GRoupInfo */