From b8dee451080b04895ae599ec61f2113fbab80932 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Tue, 19 Nov 2019 12:04:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A1=82=E6=9E=97=E5=9C=B0=E6=8E=A5?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=A2=E5=8D=95=E7=9A=84=E5=AE=A2=E4=BA=BA?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E9=BB=98=E8=AE=A4=E6=88=90=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trippestOrderSync/models/orderFinance_model.php         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/models/orderFinance_model.php b/webht/third_party/trippestOrderSync/models/orderFinance_model.php
index 4f0b8149..01172721 100644
--- a/webht/third_party/trippestOrderSync/models/orderFinance_model.php
+++ b/webht/third_party/trippestOrderSync/models/orderFinance_model.php
@@ -155,12 +155,12 @@ class OrderFinance_model extends CI_Model {
     {
         $ret = new stdClass();
         // 从订单客人名单列表中取
-        $sql = "SELECT BPL_BPE_SN,bp.BPE_GuestType
+        $sql = "SELECT BPL_BPE_SN,isnull(bp.BPE_GuestType, '1') BPE_GuestType
                 from BIZ_ConfirmLineDetail cold
                 inner join BIZ_BookPeopleList bpl on bpl.BPL_COLD_SN=cold.COLD_SN
                 inner join biz_bookpeople bp on bp.BPE_SN=bpl.BPL_BPE_SN
-                where cold.COLD_COLI_SN=$coli_sn
-                group by bpl.BPL_BPE_SN,bp.BPE_GuestType";
+                where cold.COLD_COLI_SN=$coli_sn  AND cold.DeleteFlag=0
+                group by bpl.BPL_BPE_SN,isnull(bp.BPE_GuestType, '1')";
         $query = $this->HT->query($sql);
         $ret->person_num = $query->num_rows();
         $guest_type_cnt = array_count_values(array_map(function($ele) { return $ele->BPE_GuestType; }, $query->result()));