From 3714c7b22506dc85ffaf1fee08260a1066b3ab97 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 8 May 2019 17:34:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF144=E5=89=8D,=20=E6=97=A0?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/pay/controllers/iPayLinksService.php | 1 -
 webht/third_party/pay/models/note_model.php            | 8 ++++----
 webht/third_party/paypal/controllers/index.php         | 8 +++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/webht/third_party/pay/controllers/iPayLinksService.php b/webht/third_party/pay/controllers/iPayLinksService.php
index f5a83729..65fb8869 100644
--- a/webht/third_party/pay/controllers/iPayLinksService.php
+++ b/webht/third_party/pay/controllers/iPayLinksService.php
@@ -394,7 +394,6 @@ class IPayLinksService extends CI_Controller
 
             //退款状态默认为已经处理，陆燕在退款前手动通知外联了，系统跳过处理
             if ($item->IPL_payType == 'refund') {
-                $this->send_refund($item, $old_ssje);
                 // $this->Note_model->update_send($item->IPL_dealId, 'send');
                 continue;
             }
diff --git a/webht/third_party/pay/models/note_model.php b/webht/third_party/pay/models/note_model.php
index 37c43624..ba7942ca 100644
--- a/webht/third_party/pay/models/note_model.php
+++ b/webht/third_party/pay/models/note_model.php
@@ -196,9 +196,9 @@ class Note_model extends CI_Model {
         $sql = "SELECT
                     -- gai.GAI_SN,
                     -- gaib.GAI_SN,
-                    -- COLI.COLI_ID,IPL_payType='pay' and
+                    -- COLI.COLI_ID,
                     case
-                        when (ISNULL(gaib.GAI_SN, 0)+ISNULL(gai.GAI_SN, 0))>0 then 9999
+                        when IPL_payType='pay' and (ISNULL(gaib.GAI_SN, 0)+ISNULL(gai.GAI_SN, 0))>0 then 9999
                         when IPL_payType='pay' and coli.COLI_ID is not null then 99999
                         when IPL_payType<>'pay' then 10000
                         when IPL_sent='closeRecord' then 10000
@@ -207,8 +207,8 @@ class Note_model extends CI_Model {
                     ipl.*
                 from InfoManager.dbo.IPayLinksLog ipl
                 left join Tourmanager.dbo.BIZ_ConfirmLineInfo coli on coli.COLI_ID=ipl.IPL_orderId and coli.COLI_Department=16
-                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'
+                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 and ipl.IPL_payType<>'pay') or (ipl.IPL_resultCode='0000' and ipl.IPL_payType='pay') )
                     $this->send
diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index c5b2a1fd..ce530df9 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -653,8 +653,6 @@ class Index extends CI_Controller {
                 $ordertype = 'T';
             } elseif (substr($ordertype_temp, 0, 1) == 'B') {
                 $ordertype = 'B';
-            } elseif (substr($ordertype_temp, 0, 1) == 'A') {
-                $ordertype = 'A';
             }
         }
         // 2018.05.28 for Trippest, tourMaster的订单号是01开头
@@ -749,10 +747,8 @@ class Index extends CI_Controller {
             }
             //退款状态默认为已经处理，陆燕在退款前手动通知外联了，系统跳过处理
             if ($item->pn_payment_status == 'Refunded') {
-                $this->send_refund($item, $handpick, $old_ssje);
+                $this->Note_model->update_send($item->pn_txn_id, 'send');
                 continue;
-                // $this->Note_model->update_send($item->pn_txn_id, 'send');
-                // continue;
             }
 
             //只处理完成状态，其他状态由陆燕处理
@@ -882,6 +878,7 @@ class Index extends CI_Controller {
                 $M_State = 0;
                 $this->Paypal_model->save_automail($fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_RelatedInfo, $M_State, $M_AddTime, 'paypal note');
                 //添加邮件发送记录 end
+
                 $this->Note_model->update_send($item->pn_txn_id, 'send');
             }
         }
@@ -961,6 +958,7 @@ class Index extends CI_Controller {
             }
         }
 
+
         $opi_email = !empty($advisor_info->OPI_Email) ? $advisor_info->OPI_Email : ''; //lussie@chinahighlights.net
         $opi_firstname = !empty($advisor_info->OPI_FirstName) ? $advisor_info->OPI_FirstName : !empty($advisor_info->OPI_Name) ? $advisor_info->OPI_Name : ''; //lussie