From d1a853b81abf462255e31285068d9e46ce81b8cb Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Fri, 4 Oct 2019 20:47:53 +0800
Subject: [PATCH] =?UTF-8?q?Trippest=E8=B4=A6=E5=8D=95:=20=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF=E7=9A=84=E5=9B=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trippestOrderSync/controllers/order_finance.php           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/order_finance.php b/webht/third_party/trippestOrderSync/controllers/order_finance.php
index 4e0a05eb..3fc68543 100644
--- a/webht/third_party/trippestOrderSync/controllers/order_finance.php
+++ b/webht/third_party/trippestOrderSync/controllers/order_finance.php
@@ -384,7 +384,9 @@ class Order_finance extends CI_Controller {
         $pag_sns = array();
         $unique_coli = array();
         foreach ($all_orders as $ko => $vo) {
-            if (in_array(mb_strtoupper($vo->PAG_Code), $ret->combine_pags)) {
+            if (in_array(mb_strtoupper($vo->PAG_Code), $ret->combine_pags)
+                || null === $vo->COLD_ServiceSN
+            ) {
                 $pag_sns[] = $vo->COLD_ServiceSN;
                 // 整团单拼时, 避免重复计算人数
                 // 订单人数不重复计