From 0c3d3be577f65f7ee1ffbf97a392ad8d58586fff Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 29 Aug 2024 16:44:41 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20`=E6=94=AF=E4=BB=98=E5=AE=9D`=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E5=A4=84=E7=90=86:=20=E9=87=91=E9=A2=9D=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=B7=B2=E8=AE=B0=E5=BD=95=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/pay/controllers/AlipayTradeService.php | 2 +-
 webht/third_party/pay/models/Alipay_note_model.php       | 3 ++-
 webht/third_party/paypal/controllers/index.php           | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php
index ea4abcbd..b800b331 100644
--- a/webht/third_party/pay/controllers/AlipayTradeService.php
+++ b/webht/third_party/pay/controllers/AlipayTradeService.php
@@ -917,7 +917,7 @@ class AlipayTradeService extends CI_Controller
         foreach ($biz_detail_table as $key => $row) {
             $total_amount = 0;$trade_type='';$trade_no = '';$has_charge=null;
             if (isset($row['finance_id'])) {
-                if ($row['biz_type'] !== '其它' && $row['biz_type'] !== '在线支付') {
+                if ($row['biz_type'] !== '其它' && $row['biz_type'] !== '在线支付' && $row['biz_type'] !== '转账') {
                     continue;
                 }
                 $total_amount = floatval($row['income'])>0 ? $row['income'] : $row['expenditure'];
diff --git a/webht/third_party/pay/models/Alipay_note_model.php b/webht/third_party/pay/models/Alipay_note_model.php
index f7587ed2..2bc56aab 100644
--- a/webht/third_party/pay/models/Alipay_note_model.php
+++ b/webht/third_party/pay/models/Alipay_note_model.php
@@ -125,9 +125,10 @@ class Alipay_note_model extends CI_Model {
             IF NOT EXISTS(
                 SELECT TOP 1 1
                 FROM   AlipayLog
-                WHERE  ALI_dealId = '$ALI_dealId' AND ALI_orderAmount = '$ALI_orderAmount'
+                WHERE  ALI_dealId = '$ALI_dealId'
             )
         ";
+        // AND ALI_orderAmount = '$ALI_orderAmount'
         $sql .= "
                 INSERT INTO AlipayLog
                   (
diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php
index 36dde479..dcad72d0 100644
--- a/webht/third_party/paypal/controllers/index.php
+++ b/webht/third_party/paypal/controllers/index.php
@@ -1314,6 +1314,7 @@ class Index extends CI_Controller {
             $refund_amount = bcsub($payment_memo->mc_gross, $payment_memo->mc_fee);
             $payment_fee = $payment_memo->mc_fee;
         }
+        $refund_amount = bcsub($item->pn_mc_gross, $item->pn_mc_fee);
 
         //添加支付信息入库
         //没有分配订单之前先添加付款记录,这个过程可能会执行多次，必须在添加记录前查找是否有数据