From 75472bb5e5f2dcf1286f69f5eb14248eff79f2f7 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Fri, 9 Aug 2019 12:46:07 +0800
Subject: [PATCH] =?UTF-8?q?Trippest=E8=B4=A2=E5=8A=A1=E8=A1=A8:PVT?=
 =?UTF-8?q?=E4=BA=BA=E6=95=B0=E7=9A=84=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trippestOrderSync/controllers/order_finance.php   |  2 +-
 .../trippestOrderSync/models/orderFinance_model.php   | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/order_finance.php b/webht/third_party/trippestOrderSync/controllers/order_finance.php
index d1414a09..b4b8fe8e 100644
--- a/webht/third_party/trippestOrderSync/controllers/order_finance.php
+++ b/webht/third_party/trippestOrderSync/controllers/order_finance.php
@@ -472,7 +472,7 @@ class Order_finance extends CI_Controller {
         }
         // 预定的产品数
         $ret->tour_count = count(array_unique(array_map(function($ele) {return mb_strtoupper($ele->PAG_Code);}, $all_orders)));
-        $person_num = $this->OrderFinance_model->get_order_person_num($coli_sn);
+        $person_num = $this->OrderFinance_model->get_order_person_num($coli_sn, implode(",", $ret->cold_sn));
         $ret->person_num = $person_num->person_num;
         $ret->adult_num = $person_num->adult_num;
         $ret->child_num = $person_num->child_num;
diff --git a/webht/third_party/trippestOrderSync/models/orderFinance_model.php b/webht/third_party/trippestOrderSync/models/orderFinance_model.php
index 1914a0c7..7babdda3 100644
--- a/webht/third_party/trippestOrderSync/models/orderFinance_model.php
+++ b/webht/third_party/trippestOrderSync/models/orderFinance_model.php
@@ -135,7 +135,7 @@ class OrderFinance_model extends CI_Model {
     }
 
     /** 子订单中人数最多的预定 */
-    public function get_max_cold_person_num($coli_sn=0)
+    public function get_max_cold_person_num($coli_sn=0, $cold_str='')
     {
         $sql = "SELECT
                     ISNULL(MAX(COLD_PersonNum+COLD_ChildNum+ISNULL(COLD_BabyNum,0)), 0) person_num
@@ -143,12 +143,13 @@ class OrderFinance_model extends CI_Model {
                     ,ISNULL(MAX(COLD_ChildNum+ISNULL(COLD_BabyNum,0)), 0) child_num
                     from BIZ_ConfirmLineDetail
                     where COLD_COLI_SN=$coli_sn ";
+        $sql .= $cold_str==='' ? " " : " and COLD_SN in ($cold_str) ";
         $ret = $this->HT->query($sql)->row();
         return $ret;
     }
 
     /** 订单人数 */
-    public function get_order_person_num($coli_sn=0)
+    public function get_order_person_num($coli_sn=0, $cold_str='')
     {
         $ret = new stdClass();
         // 从订单客人名单列表中取
@@ -162,8 +163,10 @@ class OrderFinance_model extends CI_Model {
         $ret->person_num = $query->num_rows();
         $guest_type_cnt = array_count_values(array_map(function($ele) { return $ele->BPE_GuestType; }, $query->result()));
         // 从子订单的人数中取最大值
-        $max_person = $this->get_max_cold_person_num($coli_sn);
-        if ($ret->person_num === 0 || $ret->person_num < $max_person->person_num) {
+        $max_person = $this->get_max_cold_person_num($coli_sn, $cold_str);
+        if ($ret->person_num === 0 || $ret->person_num < $max_person->person_num
+            || $cold_str!==''
+        ) {
             // 没有客人名单时, 客人名单小于子订单人数(如新港接送)时
             // 使用子订单结果
             $ret->person_num = $max_person->person_num;