From bbed70cd89c4533293abcb6a776c17183162e77f Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Fri, 17 Jan 2020 10:49:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Alipay=E5=BD=95=E5=85=A5=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
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_model.php            | 2 ++
 webht/third_party/pay/views/alipay_note_setting.php      | 2 +-
 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 b854131d..1fbd208a 100644
--- a/webht/third_party/pay/controllers/AlipayTradeService.php
+++ b/webht/third_party/pay/controllers/AlipayTradeService.php
@@ -1092,7 +1092,7 @@ class AlipayTradeService extends CI_Controller
             $orderid_info = json_decode($orderid_info);
             if ($orderid_info->ordertype === 'T') {
                 $data['gai_info'] = $this->Alipay_model->get_money_t($pn_txn_id);
-            } elseif ($orderid_info->ordertype === 'B') {
+            } elseif ($orderid_info->ordertype === 'B' || $orderid_info->ordertype === 'A') {
                 $data['gai_info'] = $this->Alipay_model->get_money_b($pn_txn_id);
             }
         }
diff --git a/webht/third_party/pay/models/Alipay_model.php b/webht/third_party/pay/models/Alipay_model.php
index e45844dc..65c3535a 100644
--- a/webht/third_party/pay/models/Alipay_model.php
+++ b/webht/third_party/pay/models/Alipay_model.php
@@ -420,6 +420,7 @@ class Alipay_model extends CI_Model {
 
     //根据交易号获取收款记录(传统订单)
     public function get_money_t($pn_invoice) {
+        $pn_invoice = substr($pn_invoice,0, 30);
         $like = $this->HT->escape_like_str($pn_invoice);
         $sql = "SELECT COLI_ID,GroupAccountInfo.*
                 from GroupAccountInfo
@@ -432,6 +433,7 @@ class Alipay_model extends CI_Model {
     }
     //根据交易号获取收款记录(商务订单)
     public function get_money_b($pn_invoice) {
+        $pn_invoice = substr($pn_invoice,0, 30);
         $like = $this->HT->escape_like_str($pn_invoice);
         $sql = "SELECT COLI_ID,BIZ_GroupAccountInfo.*
                 from BIZ_GroupAccountInfo
diff --git a/webht/third_party/pay/views/alipay_note_setting.php b/webht/third_party/pay/views/alipay_note_setting.php
index a7cdfde2..1f95cc3e 100644
--- a/webht/third_party/pay/views/alipay_note_setting.php
+++ b/webht/third_party/pay/views/alipay_note_setting.php
@@ -9,7 +9,7 @@
         </thead>
         <?php foreach ($gai_info as $key => $value) { ?>
         <tr>
-            <td><?php echo $value->GAI_COLI_ID; ?></td>
+            <td><?php echo $value->COLI_ID; ?></td>
             <td><?php echo $value->GAI_SQJE; ?>&nbsp;<?php echo $value->GAI_SQJECurrency; ?></td>
             <td><?php echo $value->GAI_SSJE; ?>&nbsp;CNY</td>
         </tr>