diff --git a/webht/third_party/pay/models/note_model.php b/webht/third_party/pay/models/note_model.php index ba7942ca..37c43624 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, + -- 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 diff --git a/webht/third_party/pay/views/iPayLinks_list2.php b/webht/third_party/pay/views/iPayLinks_list2.php index c382a143..97134d4d 100644 --- a/webht/third_party/pay/views/iPayLinks_list2.php +++ b/webht/third_party/pay/views/iPayLinks_list2.php @@ -194,8 +194,8 @@ 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) { diff --git a/webht/third_party/paypal/views/note_list.php b/webht/third_party/paypal/views/note_list.php index 612750ed..4dcfcb2d 100644 --- a/webht/third_party/paypal/views/note_list.php +++ b/webht/third_party/paypal/views/note_list.php @@ -210,7 +210,7 @@ echo "