From 31b064474d877ddee28c7d5801a47d8a8a64a709 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Fri, 27 Jul 2018 15:05:32 +0800
Subject: [PATCH] =?UTF-8?q?ipaylinks=20=E6=9F=A5=E8=AF=A2=E5=BC=82?=
 =?UTF-8?q?=E6=AD=A5=E9=80=9A=E7=9F=A5=E8=AE=B0=E5=BD=95,=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BD=BF=E7=94=A8IPL=E8=A1=A8=E7=9A=84key=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=20=E5=8E=9F=E5=9B=A0:=20ipaylinks=202018-07-23?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=B3=BB=E7=BB=9F=E5=90=8E=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=BE=97=E5=88=B0=E7=9A=84=E4=BA=A4=E6=98=93=E5=8F=B7=E4=B8=8D?=
 =?UTF-8?q?=E5=87=86=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/pay/controllers/iPayLinksService.php | 4 ++--
 webht/third_party/pay/models/note_model.php            | 3 ++-
 webht/third_party/pay/views/iPayLinks_list.php         | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

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;
                           }
-                          ?><a href="javascript:void(0);" title="<?php echo $item->IPL_resultMsg; ?>" onclick="show_order_modal('<?php echo $item->IPL_dealId; ?>', '<?php echo $item->IPL_orderId; ?>','<?php echo $item->IPL_noticeTime; ?>','<?php echo $item->IPL_orderId; ?>')" class="btn btn-sm <?php echo $class_css; ?>"><?php echo $show_send; ?></a>
+                          ?><a href="javascript:void(0);" title="<?php echo $item->IPL_resultMsg; ?>" onclick="show_order_modal('<?php echo $item->IPL_dealId; ?>', '<?php echo $item->IPL_orderId; ?>','<?php echo $item->IPL_noticeTime; ?>','<?php echo $item->IPL_orderId; ?>', '<?php echo $item->IPL_sn; ?>')" class="btn btn-sm <?php echo $class_css; ?>"><?php echo $show_send; ?></a>
                       </li>
                   </ul>
 
@@ -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');