From c8c4e0ffa358b4ca911d36c4d3d8df5aff513e99 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 23 Jul 2018 15:39:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=B8=AA=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93=E9=80=9A=E7=9F=A5=E6=9C=89=E8=AF=AF=E7=9A=84=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/controllers/iPayLinksService.php       | 18 +++++++++---------
 .../third_party/pay/models/IPayLinks_model.php |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/webht/third_party/pay/controllers/iPayLinksService.php b/webht/third_party/pay/controllers/iPayLinksService.php
index 29505740..11737233 100644
--- a/webht/third_party/pay/controllers/iPayLinksService.php
+++ b/webht/third_party/pay/controllers/iPayLinksService.php
@@ -263,18 +263,18 @@ class IPayLinksService extends CI_Controller
         $this->query_info_arr["orderId"]      = $orderid;
         $this->query_info_arr["beginTime"]    = date('YmdHis',strtotime("-$day_offset days"));
         $this->query_info_arr["endTime"]      = date('YmdHis',strtotime("+$day_offset days"));
-        $this->query_info_arr["mode"]         = 2;
+        $this->query_info_arr["mode"]         = 1;
 
         $this->query_info_arr["signMsg"]      = $this->generate_sign($this->query_info_arr);
         $resp = $this->curl($this->queryUrl,$this->query_info_arr);
         $resp_obj = simplexml_load_string($resp);
-        foreach ($resp_obj->details->detail as $key => $query_order) {
-            $order = new stdClass();
-            $order->check = true;
-            $order->data = $query_order;
-            $this->ipaylinks_notice($order);
-        }
-        // $this->output->set_content_type('application/json')->set_output(json_encode(simplexml_load_string($resp)));
+        // foreach ($resp_obj->details->detail as $key => $query_order) {
+        //     $order = new stdClass();
+        //     $order->check = true;
+        //     $order->data = $query_order;
+        //     $this->ipaylinks_notice($order);
+        // }
+        $this->output->set_content_type('application/json')->set_output(json_encode(simplexml_load_string($resp)));
         return;
     }
 
@@ -341,7 +341,7 @@ class IPayLinksService extends CI_Controller
         foreach ($data['unsend_list'] as $item) {
 
             //已经发送的不处理，防止重复发送
-            if ($item->IPL_sent == 'send') {
+            if ($item->IPL_sent == 'send' && empty($pn_txn_id)) {
                 continue;
             }
 
diff --git a/webht/third_party/pay/models/IPayLinks_model.php b/webht/third_party/pay/models/IPayLinks_model.php
index 49c3be6d..56096204 100644
--- a/webht/third_party/pay/models/IPayLinks_model.php
+++ b/webht/third_party/pay/models/IPayLinks_model.php
@@ -164,7 +164,7 @@ class IPayLinks_model extends CI_Model {
             IF NOT EXISTS(
                    SELECT TOP 1 1
                    FROM   BIZ_GroupAccountInfo
-                   WHERE  GAI_AccreditNo = ?  OR  GAI_Memo LIKE '%$GAI_AccreditNo%'
+                   WHERE  (GAI_AccreditNo = ?  OR  GAI_Memo LIKE '%$GAI_AccreditNo%')  and DeleteFlag=0
                )
             INSERT INTO BIZ_GroupAccountInfo (
                         GAI_COLI_SN