From f90b0691af58e810021f2772d14d242388e24f8b Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 27 Mar 2019 17:16:50 +0800
Subject: [PATCH] =?UTF-8?q?Trippest=20=E5=9C=B0=E6=8E=A5=E6=94=B6=E6=AC=BE?=
 =?UTF-8?q?=E6=95=B4=E7=90=86[=E6=9C=AA=E5=AE=8C]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/vendor_money_model.php                  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php
index 689984dc..d5a983b4 100644
--- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php
+++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php
@@ -1,6 +1,8 @@
 <?php
 defined('BASEPATH') OR exit('No direct script access allowed');
 
+define('PAY_OTHER','15017,15008,15006');
+
 class Vendor_money_model extends CI_Model {
 
     function __construct() {
@@ -44,11 +46,11 @@ class Vendor_money_model extends CI_Model {
                         ) as 总收款,
                         (select isnull(SUM(GAI_SSJE),0) from BIZ_GroupAccountInfo
                             where DeleteFlag=0 and GAI_COLI_SN=COLI_SN
-                            and GAI_Type not in (15017,15008,15006)
+                            and GAI_Type not in (" . PAY_OTHER . ")
                         ) as 海纳收款,
                         (select isnull(SUM(GAI_SSJE),0) from BIZ_GroupAccountInfo
                             where DeleteFlag=0 and GAI_COLI_SN=COLI_SN
-                            and GAI_Type in (15017,15008,15006)
+                            and GAI_Type in (" . PAY_OTHER . ")
                         ) as 地接社收款
                         ,coli.COLI_OPI_ID
 
@@ -83,9 +85,7 @@ class Vendor_money_model extends CI_Model {
                  FROM BIZ_GroupAccountInfo
                  WHERE DeleteFlag=0
                    AND GAI_COLI_SN=COLI_SN
-                   AND GAI_Type IN (15017,
-                                    15008,
-                                    15006)) AS vendor_sum ,
+                   AND GAI_Type IN (" . PAY_OTHER . ")) AS vendor_sum ,
                     coli.COLI_OPI_ID
                 FROM CK_GroupInfo cgi
                 INNER JOIN GRoupInfo gri ON CGI_GRI_SN=GRI_SN
@@ -110,9 +110,7 @@ class Vendor_money_model extends CI_Model {
                      WHERE DeleteFlag=0
                        AND GAI_COLI_SN=COLI_SN
                        AND GAI_SSJE>0
-                       AND GAI_Type IN (15017,
-                                        15008,
-                                        15006)
+                       AND GAI_Type IN (" . PAY_OTHER . ")
                 )
                 ORDER BY cgi.CGI_ArriveDate ";
         $query = $this->HT->query($sql);