From cce44f594b04bae2f3aa2de0565bf27a18f1d3ea Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 19 Jun 2019 09:33:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=B4=A6=E5=8D=95:=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=B5=84=E9=87=91=E8=B4=A6=E6=88=B7=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?;=20PayPal:=E4=BF=AE=E6=94=B9pn=5Fsn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/pay/controllers/WxpayService.php | 4 ++--
 webht/third_party/paypal/controllers/index.php     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webht/third_party/pay/controllers/WxpayService.php b/webht/third_party/pay/controllers/WxpayService.php
index 2e3bf914..f7490205 100644
--- a/webht/third_party/pay/controllers/WxpayService.php
+++ b/webht/third_party/pay/controllers/WxpayService.php
@@ -68,7 +68,7 @@ class WxpayService extends CI_Controller {
             $save_column['OPN_remark'] = $xml_arr['attach'];
             $save_column['OPN_payerLogId'] = $xml_arr['openid'];
             $save_column['OPN_payerStatus'] = $xml_arr['is_subscribe']==='Y' ? "subscribed" : NULL;
-            $save_column['OPN_fundSource'] = $xml_arr['bank_type'];
+            $save_column['OPN_fundSource'] = $site;
             $save_column['OPN_entryAmountCNY'] = floatval($ssje);
             $save_column['OPN_rawContent'] = json_encode($xml_arr);
             $save_column['OPN_noticeTime'] = date('Y-m-d H:i:s');
@@ -144,7 +144,7 @@ class WxpayService extends CI_Controller {
             $save_column['OPN_completeTime'] = date('Y-m-d H:i:s',strtotime($row['complete_time']));
             $save_column['OPN_remark'] = $row['attach'];
             $save_column['OPN_payerLogId'] = $row['openid'];
-            $save_column['OPN_fundSource'] = $row['trade_type'] . "-" .$row['bank_type'];
+            $save_column['OPN_fundSource'] = $target_account;
             $save_column['OPN_rawContent'] = json_encode($row);
             $save_column['OPN_noticeTime'] = date('Y-m-d H:i:s');
 
diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index 191be529..85bde232 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -1211,7 +1211,7 @@ class Index extends CI_Controller {
             $send_type = "send";
         }
 
-        $this->Note_model->update_send($paypal_msg->pn_txn_id, $send_type, $item->pn_sn);
+        $this->Note_model->update_send($paypal_msg->pn_txn_id, $send_type, $paypal_msg->pn_sn);
     }
 
     //所有记录列表
@@ -1306,7 +1306,7 @@ class Index extends CI_Controller {
         $data = array();
         $data['note'] = $this->Note_model->note($pn_txn_id);
         if (!empty($data['note'])) {
-            $this->Note_model->update_send($pn_txn_id, 'send', $item->pn_sn);
+            $this->Note_model->update_send($pn_txn_id, 'send');
             echo json_encode('通知已经关闭！');
             return true;
         }
@@ -1568,7 +1568,7 @@ class Index extends CI_Controller {
         $data = array();
         $data['note'] = $this->Note_model->note($pn_txn_id);
         if (!empty($data['note'])) {
-            $this->Note_model->update_send($pn_txn_id, 'closeRecord', $item->pn_sn);
+            $this->Note_model->update_send($pn_txn_id, 'closeRecord');
             echo json_encode('该收款记录已经忽略！');
             return true;
         }