From 38a5438585dd7cc1a5966bdfff01b34af2ad5ec5 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 26 Mar 2020 10:28:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20iPaylinks=E6=97=A5=E8=B4=A6=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 download_statement/download_files.php          | 18 +++++++++++++++---
 .../pay/controllers/PaymentService.php         |  4 ++++
 .../pay/controllers/WxpayService.php           |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/download_statement/download_files.php b/download_statement/download_files.php
index 7e9c48a4..f1d948e5 100644
--- a/download_statement/download_files.php
+++ b/download_statement/download_files.php
@@ -12,6 +12,9 @@ $target_folder = null;
 $targer_day = null;
 // 获取前一天的对账单
 $target_folder = str_replace("-", "/", date("Y-m", strtotime("-1 day")) );  // 2018/07
+$targer_date = explode('/', $target_folder);
+$target_year = $targer_date[0];
+$target_month = $targer_date[1];
 if (isset($_GET['f'])) {
     $target_folder = $_GET['f'];    // f=2018/06 f=2018/07/23
     $target_set = explode('/', $target_folder);
@@ -22,10 +25,17 @@ if (isset($_GET['f'])) {
 }
 $file_list = array_values(array_diff($sftp->nlist($target_folder), array(".","..")));
 if ($targer_day !== null) {
-    $file_list = array($target_set[0] . $target_set[1] . $target_set[2] . ".xlsx");
+    $day_file_name = $target_set[0] . $target_set[1] . $target_set[2];
+    $target_file_list = array_map(function ($ele) use ($day_file_name)
+    {
+        return stripos($ele, $day_file_name)===false ? null : $ele;
+    }, $file_list);
+    $file_list = array_values(array_filter($target_file_list));
+    // $file_list = array($target_set[0] . $target_set[1] . $target_set[2] . ".xlsx");
 }
 // target local
-$target_local = "statement_files/" . $target_folder;
+$target_local = "settlement_files/ipaylinks-" . $target_folder;
+// $target_local = "statement_files/ipaylinks-" . $target_folder;
 if ( ! is_dir($target_local)) {
     mkdir($target_local, 0777, true);
 }
@@ -47,5 +57,7 @@ echo "<br> new_files ", json_encode($new_files);
 echo "<br> file_list ", json_encode($file_list);
 
 // header("Location: http://www.mycht.cn/webht.php/apps/pay/ipaylinksservice/auto_update_statement?f=$target_folder&fjson=" . json_encode($new_files));
-header("Location: http://www.mycht.cn/webht.php/apps/pay/report/ipaylinks_excel?f=$target_folder&fjson=" . json_encode($new_files));
+// header("Location: http://www.mycht.cn/webht.php/apps/pay/report/ipaylinks_excel?f=$target_folder&fjson=" . json_encode($new_files));
+    $yestoday = date("Y/m/d", strtotime("-1 day"));
+    header("Location: http://www.mycht.cn/webht.php/apps/pay/paymentservice/ipalinks_settlement/$yestoday");
 // header("Location: http://202.103.68.79:8083/webht.php/apps/pay/report/ipaylinks_excel?f=$target_folder&fjson=" . json_encode($new_files));
diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php
index bd2716ef..e10dbe22 100644
--- a/webht/third_party/pay/controllers/PaymentService.php
+++ b/webht/third_party/pay/controllers/PaymentService.php
@@ -619,6 +619,10 @@ class PaymentService extends CI_Controller {
         $target_folder = "ipaylinks-" . $year;
         $target_file = $year . "-" . $month;
         // $target_file .= ($day===null) ? null : ("-" . $day);
+        if ($day !== null) {
+            $target_folder .= "\\" . $month;
+            $target_file = $year . $month . $day . "_transaction";
+        }
         $statement_folder = FCPATH.'download_statement\settlement_files\\' . $target_folder;
         if ( ! is_dir($statement_folder)) {
             echo "read folder failed";
diff --git a/webht/third_party/pay/controllers/WxpayService.php b/webht/third_party/pay/controllers/WxpayService.php
index ab1efaac..12a77b3a 100644
--- a/webht/third_party/pay/controllers/WxpayService.php
+++ b/webht/third_party/pay/controllers/WxpayService.php
@@ -94,6 +94,7 @@ class WxpayService extends CI_Controller {
         }
         async_curl($this->config->item('send_notify_url', 'wxpay'));
         async_curl('https://www.mycht.cn/webht.php/apps/pay/alipaytradeservice/get_billfile');
+        async_curl('https://www.mycht.cn/download_statement/download_files.php'); // iPaylinks日账单
         /**
          * 每月20号发送退款给财务
          */