From e36b73bbf821d28d104621a04579542a60809d70 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Fri, 16 Nov 2018 17:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E8=A1=A8:=20=E6=8B=BC?=
 =?UTF-8?q?=E5=9B=A2=E7=9A=84=E8=AE=A1=E7=AE=97=E4=B8=8D=E8=83=BD=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=E5=8F=AA=E8=83=BDpvt=E7=9A=84=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/trippestOrderSync/controllers/order_finance.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webht/third_party/trippestOrderSync/controllers/order_finance.php b/webht/third_party/trippestOrderSync/controllers/order_finance.php
index f5033d91..6c4345d6 100644
--- a/webht/third_party/trippestOrderSync/controllers/order_finance.php
+++ b/webht/third_party/trippestOrderSync/controllers/order_finance.php
@@ -111,6 +111,8 @@ class Order_finance extends CI_Controller {
                 continue;
             }
             if ($vc->GCI_groupType == 1) {
+                // 除去只能PVT的. 避免预定接送*1+tour*1, tour拼团只有一个订单, 被视为整团pvt,漏算接送成本
+                $processed_code = array_diff($processed_code, $this->forbidden_combine());
                 $ret->pvt = $pvt_cost = $this->pvt_basic($vc->GCI_combineNo, $coli_sn, $processed_code);
             } else if ($vc->GCI_groupType == 2) {
                 // 这里不排除产品编号是否已处理, 因为重复的情况比较多