From 628148737408c59a8abc08504bce980ca408fe70 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 30 Jul 2018 09:35:16 +0800
Subject: [PATCH] =?UTF-8?q?ipaylinks=20=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/pay/models/note_model.php     | 4 ++--
 webht/third_party/pay/views/iPayLinks_list2.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/pay/models/note_model.php b/webht/third_party/pay/models/note_model.php
index fb6bb8f0..ce206ad6 100644
--- a/webht/third_party/pay/models/note_model.php
+++ b/webht/third_party/pay/models/note_model.php
@@ -150,7 +150,7 @@ class Note_model extends CI_Model {
             FROM   IPayLinksLog  pn
             WHERE 1=1
                 and pn.IPL_payType='pay'
-                and (pn.IPL_stateCode=2 or pn.IPL_resultCode='0000')
+                and (pn.IPL_resultCode='0000')
                 $this->send
                 $this->search
                 $this->dealId
@@ -207,7 +207,7 @@ class Note_model extends CI_Model {
                 left join Tourmanager.dbo.BIZ_GroupAccountInfo gaib on ipl.IPL_dealId=gaib.GAI_AccreditNo and gaib.DeleteFlag=0 and ipl.IPL_payType='pay'
                 left join Tourmanager.dbo.GroupAccountInfo gai on gai.GAI_AccreditNo=ipl.IPL_dealId and gai.DeleteFlag=0 and ipl.IPL_payType='pay'
                 where 1=1
-                    and ( ipl.IPL_stateCode=2 or ipl.IPL_resultCode='0000')
+                    and ( (ipl.IPL_stateCode=2 and ipl.IPL_payType<>'pay') or (ipl.IPL_resultCode='0000' and ipl.IPL_payType='pay') )
                     and (
                         1=1
                         $this->send
diff --git a/webht/third_party/pay/views/iPayLinks_list2.php b/webht/third_party/pay/views/iPayLinks_list2.php
index 36c5a1e1..2b5dac34 100644
--- a/webht/third_party/pay/views/iPayLinks_list2.php
+++ b/webht/third_party/pay/views/iPayLinks_list2.php
@@ -182,7 +182,7 @@
                             $isRecord = '已录入';
                           } else {
                             $isRecord = '未记录';
-                            $record_class = ' btn btn-sm btn_margin btn-danger ';
+                            $record_class = ' btn btn-sm btn_margin btn-warning ';
                           }
                           ?>
                           <a href="javascript:void(0);" onclick="" class="<?php echo $record_class; ?>"><?php echo $isRecord; ?></a>