From 2b3eee966ff74ecfc0dd28cadb6ad5d7d2677bb3 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 16 May 2019 10:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=97=85=E7=9A=84=E6=94=B6=E6=AC=BE?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95,=20=E7=BE=8E=E9=87=91=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E5=86=99=E5=85=A5GAI=5FMoney,=20=E6=89=80=E6=9C=89=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/paypal/controllers/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index 77ec94f2..6bcc96a8 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -958,6 +958,7 @@ class Index extends CI_Controller {
         if (!empty($orderid_info)) {
             $ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency));
             $ssje = $old_ssje===NULL ? $ssje : $old_ssje;
+            $USD_amount = $this->Paypal_model->get_USD($item->pn_mc_gross, $item->pn_mc_currency);
             //更新还没有填的客邮和交易号de收款记录（商务订单）
             if (isset($advisor_info->order_type) && $advisor_info->order_type == 0) {
                 $ht_memo = '(自动录入)退款号:' . $item->pn_txn_id . "\n. ";
@@ -971,7 +972,7 @@ class Index extends CI_Controller {
                     if (false == $this->Paypal_model->if_biz_gai_exists($item->pn_txn_id) ) {
                         $this->Paypal_model->insert_biz_order_log($GAI_COLI_SN, 'Refunded');
                     }
-                    $this->Paypal_model->add_account_info($GAI_COLI_SN, $advisor_info->COLI_ID, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $ssje, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payer, $item->pn_payer_email, $item->pn_txn_id, $ht_memo);
+                    $this->Paypal_model->add_account_info($GAI_COLI_SN, $advisor_info->COLI_ID, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $USD_amount, $ssje, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payer, $item->pn_payer_email, $item->pn_txn_id, $ht_memo);
                 }
             }
             //更新还没有填的客邮和交易号的收款记录（传统订单）