diff --git a/webht/third_party/pay/controllers/iPayLinksService.php b/webht/third_party/pay/controllers/iPayLinksService.php
index addba6cf..bf9f2b2b 100644
--- a/webht/third_party/pay/controllers/iPayLinksService.php
+++ b/webht/third_party/pay/controllers/iPayLinksService.php
@@ -900,11 +900,11 @@ class IPayLinksService extends CI_Controller
}
//获取note详情,以便后续修改各项数据
- public function note_modal($pn_txn_id = false, $pn_invoice = false ,$notice_time = false) {
+ public function note_modal($pn_txn_id = false, $pn_invoice = false, $pn_id = null) {
$data = array();
$data['IPL_orderId'] = $pn_invoice;
if (!empty($pn_txn_id)) {
- $data['note'] = $this->Note_model->note($pn_txn_id);
+ $data['note'] = $this->Note_model->note($pn_txn_id, $pn_id);
if (!empty($data['note'])) {
if (!empty($pn_invoice)) {
$orderid_info = $this->analysis_orderid($pn_invoice);
diff --git a/webht/third_party/pay/models/note_model.php b/webht/third_party/pay/models/note_model.php
index 65be8ea2..6bdf5fcf 100644
--- a/webht/third_party/pay/models/note_model.php
+++ b/webht/third_party/pay/models/note_model.php
@@ -48,10 +48,11 @@ class Note_model extends CI_Model {
return $this->get_list();
}
- public function note($txn_id){
+ public function note($txn_id, $pn_id=null){
$this->init();
$this->topnum=1;
$this->dealId=" AND IPL_dealId=".$this->INFO->escape($txn_id);
+ $this->dealId .= ($pn_id===null) ? " " : " AND IPL_sn=" . $pn_id;
return $this->get_list();
}
diff --git a/webht/third_party/pay/views/iPayLinks_list.php b/webht/third_party/pay/views/iPayLinks_list.php
index 2c19a7d3..8b3b3a45 100644
--- a/webht/third_party/pay/views/iPayLinks_list.php
+++ b/webht/third_party/pay/views/iPayLinks_list.php
@@ -166,7 +166,7 @@
$class_css = 'btn-danger';
$show_send = $item->IPL_sent;
}
- ?>
+ ?>
@@ -253,12 +253,12 @@
return date;
}
});
- function show_order_modal(pn_txn_id, pn_invoice,noticeTime,old_order) {
+ function show_order_modal(pn_txn_id, pn_invoice,noticeTime,old_order, pn_id) {
if (pn_txn_id) {
$.ajax({
type: "get",
dataType: "json",
- url: '/webht.php/apps/pay/ipaylinksservice/note_modal/' + pn_txn_id + '/' + pn_invoice,
+ url: '/webht.php/apps/pay/ipaylinksservice/note_modal/' + pn_txn_id + '/' + pn_invoice + '/' + pn_id,
success: function(data, textStatus) {
$('#modal_set_orderid_body').html(data);
$('#modal_set_orderid').modal('show');