From 1f0148634e4c8721a6dd6b160a051ca8eb6d523f Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 1 Jul 2019 10:13:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?Alipay=20APP=E9=80=80=E6=AC=BE=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/pay/controllers/AlipayTradeService.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php
index e206c23d..d16ec46c 100644
--- a/webht/third_party/pay/controllers/AlipayTradeService.php
+++ b/webht/third_party/pay/controllers/AlipayTradeService.php
@@ -537,15 +537,15 @@ class AlipayTradeService extends CI_Controller
         $parent_note = $this->Alipay_note_model->note($parent_trade_no);
         // APP 组的退款查不到原始收款记录 todo
         if (empty($parent_note) ) { # && true === $this->Alipay_note_model->if_APP_order($parent_order) ) {
-            // $parent_note = $parent_payment;
+            $parent_note = $item;
             // 补充字段
             // $parent_note->IPL_orderId = $parent_order . '_B';
             // $parent_note->IPL_currencyCode = $parent_payment->currencyCode;
             // $parent_note->IPL_payerName = strval("''");
             // $parent_note->IPL_payerEmail = strval("''");
 
-            $this->Alipay_note_model->update_send($item->ALI_dealId, 'sendfail');
-            return false;
+            // $this->Alipay_note_model->update_send($item->ALI_dealId, 'sendfail');
+            // return false;
         }
         //订单号
         $orderid_info = analysis_orderid($parent_note->ALI_orderId);

From a1af22ee13083be92cf5fab51e942fd303adbaff Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 1 Jul 2019 10:19:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Alipay=E4=B8=8B=E8=BD=BD=E8=B4=A6=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8D=E9=87=8D=E5=A4=8D=E5=86=99=E5=85=A5note?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/controllers/AlipayTradeService.php            |  1 +
 webht/third_party/pay/models/Alipay_note_model.php    | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php
index d16ec46c..d2079dd9 100644
--- a/webht/third_party/pay/controllers/AlipayTradeService.php
+++ b/webht/third_party/pay/controllers/AlipayTradeService.php
@@ -876,6 +876,7 @@ class AlipayTradeService extends CI_Controller
                 ,'TRADE_SUCCESS'
                 ,NULL
                 ,$row['buyer_user_name']
+                ,null,true
             );
         }
         return;
diff --git a/webht/third_party/pay/models/Alipay_note_model.php b/webht/third_party/pay/models/Alipay_note_model.php
index cafe422b..ef99b7e4 100644
--- a/webht/third_party/pay/models/Alipay_note_model.php
+++ b/webht/third_party/pay/models/Alipay_note_model.php
@@ -89,8 +89,15 @@ class Alipay_note_model extends CI_Model {
      * @author LYT <lyt@hainatravel.com>
      * @date   2017-08-29
      */
-    public function save_alipay($ALI_dealId,$ALI_orderId,$ALI_currencyCode,$ALI_orderAmount,$ALI_payAmount,$ALI_stateCode,$ALI_acquiringTime,$ALI_completeTime,$ALI_memo,$ALI_payType,$ALI_resultCode=null,$ALI_resultMsg=null,$ALI_payerName=null,$ALI_payerEmail=NULL) {
-        $sql = "
+    public function save_alipay($ALI_dealId,$ALI_orderId,$ALI_currencyCode,$ALI_orderAmount,$ALI_payAmount,$ALI_stateCode,$ALI_acquiringTime,$ALI_completeTime,$ALI_memo,$ALI_payType,$ALI_resultCode=null,$ALI_resultMsg=null,$ALI_payerName=null,$ALI_payerEmail=NULL, $check_exists=false) {
+        $sql = $check_exists===false ? "" : "
+            IF NOT EXISTS(
+                SELECT TOP 1 1
+                FROM   AlipayLog
+                WHERE  ALI_dealId = '$ALI_dealId'
+            )
+        ";
+        $sql .= "
                 INSERT INTO AlipayLog
                   (
                       ALI_dealId,ALI_orderId,ALI_currencyCode,ALI_orderAmount,ALI_payAmount,ALI_stateCode,ALI_acquiringTime,ALI_completeTime,ALI_memo,ALI_sent,ALI_noticeTime,ALI_payType,ALI_resultCode,ALI_resultMsg,ALI_payerName,ALI_payerEmail