From 4ff6f4276879322168b7c6b4c7a460aa0b3939b3 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 10 Oct 2025 12:02:50 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20WxPay:=20=E4=BB=98=E6=AC=BE=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95,=20=E6=A8=A1=E7=B3=8A=E6=9F=A5=E6=89=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/models/Online_payment_account_model.php           | 8 +++++---
 webht/third_party/pay/views/payment_gai_setting.php       | 7 +++++--
 webht/third_party/pay/views/payment_list.php              | 8 ++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/webht/third_party/pay/models/Online_payment_account_model.php b/webht/third_party/pay/models/Online_payment_account_model.php
index 5c38250c..27168af2 100644
--- a/webht/third_party/pay/models/Online_payment_account_model.php
+++ b/webht/third_party/pay/models/Online_payment_account_model.php
@@ -167,9 +167,10 @@ class Online_payment_account_model extends CI_Model {
     public function get_group_info_by_transactionid($pn_txn_id) {
         $info_sql = "SELECT GAI_SN, GAI_State,GAI_COLI_ID as orderId
                     ,CAST(GAI_SQJE AS VARCHAR) GAI_SQJE,GAI_SQJECurrency
-                    ,CAST(GAI_SSJE AS VARCHAR) GAI_SSJE
+                    ,CAST(GAI_SSJE AS VARCHAR) GAI_SSJE,GAI_Memo
                     ,'B' AS ordertype FROM BIZ_GroupAccountInfo
                     WHERE GAI_AccreditNo = '$pn_txn_id'
+                        OR CHARINDEX('$pn_txn_id', gai_memo) > 0
                     UNION
                     SELECT GAI_SN, GAI_State
                     ,(
@@ -178,10 +179,11 @@ class Online_payment_account_model extends CI_Model {
                         WHERE cli.COLI_SN = GAI_COLI_SN
                     ) AS orderId
                     ,cast(GAI_SQJE as varchar) GAI_SQJE,GAI_SQJECurrency
-                    ,cast(GAI_SSJE as varchar) GAI_SSJE
+                    ,cast(GAI_SSJE as varchar) GAI_SSJE,GAI_Memo
                     ,'T' AS ordertype
                     FROM GroupAccountInfo
-                    WHERE GAI_AccreditNo = '$pn_txn_id'";
+                    WHERE GAI_AccreditNo = '$pn_txn_id'
+                        OR CHARINDEX('$pn_txn_id', gai_memo) > 0";
 
         $info_query = $this->HT->query($info_sql);
         $info_result = $info_query->result();
diff --git a/webht/third_party/pay/views/payment_gai_setting.php b/webht/third_party/pay/views/payment_gai_setting.php
index 3d523f2f..9f9f722c 100644
--- a/webht/third_party/pay/views/payment_gai_setting.php
+++ b/webht/third_party/pay/views/payment_gai_setting.php
@@ -1,17 +1,20 @@
 <form action="/webht.php/apps/pay/paymentService/gai_modal_save" method="post" id="form_modal_gai" name="form_modal_gai">
-    <?php if ( ! empty($gai_info)) { ?>
-    <p>已录入订单 <?php echo!empty($old_order) ? $old_order : ""; ?></p>
+    <?php // var_dump($gai_info);
+    if ( ! empty($gai_info)) { ?>
+    <p>已录入订单 <?php echo !empty($old_order) ? $old_order : ""; ?></p>
     <table class="table table-hover table-bordered">
         <thead>
             <th>订单号</th>
             <th>申请金额/币种</th>
             <th>实收金额</th>
+            <th>付款记录备注</th>
         </thead>
         <?php foreach ($gai_info as $key => $value) { ?>
         <tr>
             <td><?php echo $value->orderId; ?></td>
             <td><?php echo $value->GAI_SQJE; ?>&nbsp;<?php echo $value->GAI_SQJECurrency; ?></td>
             <td><?php echo $value->GAI_SSJE; ?>&nbsp;CNY</td>
+            <td><?php echo $value->GAI_Memo; ?></td>
         </tr>
         <?php } ?>
     </table>
diff --git a/webht/third_party/pay/views/payment_list.php b/webht/third_party/pay/views/payment_list.php
index 1ed6850b..a00411a4 100644
--- a/webht/third_party/pay/views/payment_list.php
+++ b/webht/third_party/pay/views/payment_list.php
@@ -160,16 +160,16 @@
             <a <?php if($method_code==='all') { ?> class="text-muted"<?php }  ?>
                 href="<?php echo set_url_param(array('method'=>'all')) ?>">ALL</a>
             &NonBreakingSpace;&boxv;&NonBreakingSpace;
-            <a <?php if($method_code==='15016') { ?> class="text-muted"<?php } ?>
+            <a <?php if(stripos($method_code, '15016') !== false) { ?> class="text-muted"<?php } ?>
                 href="<?php echo set_url_param(array('method'=>15016)) ?>">微信&raquo;</a>
             &NonBreakingSpace;
-            <a <?php if($method_code==='15002') { ?> class="text-muted"<?php } ?>
+            <a <?php if(stripos($method_code,'15002') !== false) { ?> class="text-muted"<?php } ?>
                 href="<?php echo set_url_param(array('method'=>15002)) ?>">PayPal&raquo;</a>
             &NonBreakingSpace;
-            <a <?php if($method_code==='15018,15035') { ?> class="text-muted"<?php } ?>
+            <a <?php if(stripos($method_code,'15018') !== false || stripos($method_code,'15035') !== false) { ?> class="text-muted"<?php } ?>
                 href="<?php echo set_url_param(array('method'=>'15018,15035')) ?>">信用卡&raquo;</a>
             &NonBreakingSpace;
-            <a <?php if($method_code==='15015') { ?> class="text-muted"<?php } ?>
+            <a <?php if(stripos($method_code,'15015') !== false) { ?> class="text-muted"<?php } ?>
                 href="<?php echo set_url_param(array('method'=>15015)) ?>">支付宝&raquo;</a>
             &NonBreakingSpace;
             &boxv;&NonBreakingSpace;