From 798cfd14b6dfd19737e1435c0ba8dc08e856569a Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 12 Mar 2020 18:08:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/controllers/PaymentService.php         |  4 +++-
 .../third_party/pay/helpers/payment_helper.php |  7 +++++++
 .../pay/libraries/ipaylinks_call.php           |  4 ++++
 webht/third_party/pay/views/payment_list.php   | 18 ++++++++----------
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php
index c1d31f05..b5ae209d 100644
--- a/webht/third_party/pay/controllers/PaymentService.php
+++ b/webht/third_party/pay/controllers/PaymentService.php
@@ -28,10 +28,12 @@ class PaymentService extends CI_Controller {
     {
     }
 
-    public function note_list($method=null)
+    public function note_list()
     {
         $this->permission->is_admin(true);
         $data = array();
+        $method = $this->input->get_post("method");
+        $method = $method===false ? null : $method;
         $data['method_code'] = '';
         // $data["paytext"] = $this->payment_status();
         if (isset($this->code_brandname[$method])) {
diff --git a/webht/third_party/pay/helpers/payment_helper.php b/webht/third_party/pay/helpers/payment_helper.php
index 181c0118..3be012cd 100644
--- a/webht/third_party/pay/helpers/payment_helper.php
+++ b/webht/third_party/pay/helpers/payment_helper.php
@@ -295,3 +295,10 @@ function characet($data, $targetCharset) {
     }
     return $data;
 }
+
+function set_url_param($param_arr=array())
+{
+    parse_str(parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY), $current_param);
+    $param_arr = $current_param===null ? $param_arr : array_merge($current_param, $param_arr);
+    return strstr($_SERVER['REQUEST_URI'],'?', true) . "?" . http_build_query($param_arr);
+}
diff --git a/webht/third_party/pay/libraries/ipaylinks_call.php b/webht/third_party/pay/libraries/ipaylinks_call.php
index 3382cf4f..649e795e 100644
--- a/webht/third_party/pay/libraries/ipaylinks_call.php
+++ b/webht/third_party/pay/libraries/ipaylinks_call.php
@@ -212,6 +212,10 @@ class Ipaylinks_call
             if (true === $note_exists) {
                 continue; // test:
             }
+            // test: 月账单太长
+            if ($settle_cnt > 999) {
+                break;
+            }
             $order_info = $this->ci->account_model
                             ->get_gai(
                                 $save_column['OPN_transactionId'],
diff --git a/webht/third_party/pay/views/payment_list.php b/webht/third_party/pay/views/payment_list.php
index c7ad4bb9..04aefaed 100644
--- a/webht/third_party/pay/views/payment_list.php
+++ b/webht/third_party/pay/views/payment_list.php
@@ -125,22 +125,20 @@
               <img width="150" style="height:40px;" src="/css/nav/img/6000.png">
           </a>
           <h1>Payment List</h1>
-            <a href="/webht.php/apps/pay/paymentservice/note_list">ALL</a>
-            &NonBreakingSpace;
+            <a <?php if($method_code==='') { ?> class="text-muted"<?php }  ?>
+                href="/webht.php/apps/pay/paymentservice/note_list">ALL</a>
+            &NonBreakingSpace;&boxv;&NonBreakingSpace;
             <a <?php if($method_code==='15016') { ?> class="text-muted"<?php } ?>
-                href="/webht.php/apps/pay/paymentservice/note_list/15016">微信&raquo;</a>
+                href="<?php echo set_url_param(array('method'=>15016)) ?>">微信&raquo;</a>
             &NonBreakingSpace;
-            <!-- <a href="http://www.mycht.cn/webht.php/apps/paypal/index/note_list">PayPal&raquo;</a> -->
             <a <?php if($method_code==='15002') { ?> class="text-muted"<?php } ?>
-                href="/webht.php/apps/pay/paymentservice/note_list/15002">PayPal&raquo;</a>
+                href="<?php echo set_url_param(array('method'=>15002)) ?>">PayPal&raquo;</a>
             &NonBreakingSpace;
             <a <?php if($method_code==='15018') { ?> class="text-muted"<?php } ?>
-                href="/webht.php/apps/pay/paymentservice/note_list/15018">信用卡&raquo;</a>
-            <!-- <a href="https://www.mycht.cn/webht.php/apps/pay/ipaylinksservice/note_list">信用卡&raquo;</a> -->
+                href="<?php echo set_url_param(array('method'=>15018)) ?>">信用卡&raquo;</a>
             &NonBreakingSpace;
             <a <?php if($method_code==='15015') { ?> class="text-muted"<?php } ?>
-                href="/webht.php/apps/pay/paymentservice/note_list/15015">支付宝&raquo;</a>
-            <!-- <a href="https://www.mycht.cn/webht.php/apps/pay/AlipayTradeService/index">支付宝&raquo;</a> -->
+                href="<?php echo set_url_param(array('method'=>15015)) ?>">支付宝&raquo;</a>
             &NonBreakingSpace;
             <ul class="nav navbar-nav navbar-right pull-right" style="margin:7.5px 0;">
               <li class="dropdown">
@@ -288,7 +286,7 @@ jQuery.browser = {};
         dateFormat: "Y-m-d",
         defaultDate: "<?php echo $date; ?>",
         onChange: function (selectedDates, dateStr, instance) {
-          window.location.href = '/webht.php/apps/pay/paymentservice/note_list?date=' + dateStr;
+            window.location.href = '/webht.php/apps/pay/paymentservice/note_list?date=' + dateStr;
         }
     });
     })