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 @@
- -

已录入订单

+ +

已录入订单

+ $value) { ?> +
订单号 申请金额/币种 实收金额付款记录备注
orderId; ?> GAI_SQJE; ?> GAI_SQJECurrency; ?> GAI_SSJE; ?> CNYGAI_Memo; ?>
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 @@ class="text-muted" href="'all')) ?>">ALL  │  - class="text-muted" + class="text-muted" href="15016)) ?>">微信»   - class="text-muted" + class="text-muted" href="15002)) ?>">PayPal»   - class="text-muted" + class="text-muted" href="'15018,15035')) ?>">信用卡»   - class="text-muted" + class="text-muted" href="15015)) ?>">支付宝»   │