From b421108b43bc459f2fb1808eb43cbe296259c0d5 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 17 Jul 2024 11:48:40 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20PayPal=E5=AD=97=E6=AE=B5:=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/paypal/views/note_list.php    | 4 ++--
 webht/third_party/paypal/views/note_setting.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/paypal/views/note_list.php b/webht/third_party/paypal/views/note_list.php
index 34036375..602564a6 100644
--- a/webht/third_party/paypal/views/note_list.php
+++ b/webht/third_party/paypal/views/note_list.php
@@ -212,7 +212,7 @@
                     <li class="col-sm-4"><strong>客人邮箱</strong></li>
                     <li class="col-sm-4 "><strong>交易号</strong></li>
                     <li class="col-sm-3 "><strong>交易(北京)时间</strong></li>
-                    <li class="col-sm-3 "><strong>系统通知时间</strong></li>
+                    <li class="col-sm-3 "><strong>系统处理时间</strong></li>
                     <li class="col-sm-3 "><strong>通知状态</strong></li>
                 </a>
             </ul>
@@ -248,7 +248,7 @@
                     </li>
 
                     <li class="col-sm-3 nopadding-L" style="overflow:hidden;word-break: break-all;height: 25px;"><?php echo date('Y-m-d H:i:s', strtotime($item->pn_payment_date) + 3600 * 8); ?></li>
-                    <li class="col-sm-3 nopadding-L" ><?php echo $item->pn_datetime; ?></li>
+                    <li class="col-sm-3 nopadding-L" ><?php echo empty($item->pn_lastedittime) ? $item->pn_datetime : $item->pn_lastedittime; ?></li>
                     <li class="col-sm-3" >
                         <?php
                         $show_send = '';
diff --git a/webht/third_party/paypal/views/note_setting.php b/webht/third_party/paypal/views/note_setting.php
index f5f9308c..2715ed25 100644
--- a/webht/third_party/paypal/views/note_setting.php
+++ b/webht/third_party/paypal/views/note_setting.php
@@ -22,7 +22,7 @@
     </dl>
     <dl class="dl-horizontal">
         <dt>付款时间</dt>
-        <dd><?php echo date('Y-m-d H:i:s', strtotime($note->pn_payment_date) + 3600 * 8); ?></dd>
+        <dd><?php echo date('Y-m-d H:i:s', strtotime($note->pn_payment_date) + 3600 * 8); ?>&nbsp;&nbsp;&nbsp;&nbsp;通知:<?php echo date('Y-m-d H:i:s', strtotime($note->pn_datetime)); ?></dd>
     </dl>
     <dl class="dl-horizontal">
         <dt>备注&nbsp;/&nbsp;留言</dt>