paypal,iPaylinks 推送列表的发送状态显示;

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,
+                    -- COLI.COLI_ID,IPL_payType='pay' and
                     case
-                        when IPL_payType='pay' and (ISNULL(gaib.GAI_SN, 0)+ISNULL(gai.GAI_SN, 0))>0 then 9999
+                        when (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

webht/third_party/pay/views/iPayLinks_list2.php

@@ -194,8 +194,8 @@
                           <?php
                           $show_send = '';
                           $class_css = '';
-                          if ($item->IPL_sent == 'send') {
-                              $show_send = $item->IPL_sent;
+                          if ($item->IPL_sent == 'send' || substr($item->IPL_sent, 0, 5) == 'send-') {
+                              $show_send = 'send';
                           } else if ($item->IPL_sent == 'closeRecord') {
                               $show_send = "已忽略";
                           } else if (strcmp(trim($item->IPL_stateCode), "2") && $item->IPL_stateCode != NULL) {

webht/third_party/paypal/views/note_list.php

@@ -210,7 +210,7 @@ echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true
                         $class_css = '';
                         $show_record = '查看录入状态';
                         if ($item->pn_send == 'send' || substr($item->pn_send, 0, 5) == "send-") {
-                            $show_send = $item->pn_send;
+                            $show_send = 'send';
                         } elseif ($item->pn_send == 'closeRecord') {
                             $show_send = $show_record = '已忽略';
                         } else if ($item->pn_payment_status == 'Completed') {