Merge branch 'master' of https://gitee.com/hainatravel/information-system

application/third_party/trainsystem/config/config.php

@@ -105,7 +105,7 @@ $config["train_passportty"]=array(
                     );
 					
 //黑名单用户
-$config['black_list'] = array('209582910','539152642','506157109','E66735489','E66735492','E80377215','G23001338','E95287649','345276546','PA4286015','G09382769','G26113116','G25996274','572309763','506620366','505897939','E71156367','E21961674','v716898','561669436','EL657289','533300106','482225223','514815909','592108236','370682199509218814','130924199003161572','410728199011287038','372324199503253215','ED6234008');					
+$config['black_list'] = array('209582910','539152642','506157109','E66735489','E66735492','E80377215','G23001338','E95287649','345276546','PA4286015','G09382769','G26113116','G25996274','572309763','506620366','505897939','E71156367','E21961674','v716898','561669436','EL657289','533300106','482225223','514815909','592108236','370682199509218814','130924199003161572','410728199011287038','372324199503253215','ED6234008','E69411908','EF1981503');					
 		
 //设置session 2592000
 $config['sess_cookie_name']	= 'trainsystem';

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);
             }
         }

webht/third_party/pay/controllers/WxpayService.php

@@ -132,6 +132,7 @@ class WxpayService extends CI_Controller {
                 $save_column['OPN_resultMsg'] = $row['refund_status'];
                 $save_column['OPN_entryAmountCNY'] = floatval("-" . $ssje);
                 $save_column['OPN_noticeType'] = 'refund';
+                $save_column['OPN_relatedId'] = $row['transaction_id'];
             } else {
                 // 收款
                 $ssje = $this->account_model->get_ssje($row['settlement_total_fee'], str_replace("CNY", "RMB", strtoupper($row['currency_type'])), $save_column['OPN_accountMethod']);
@@ -142,6 +143,7 @@ class WxpayService extends CI_Controller {
                 $save_column['OPN_resultMsg'] = $row['trade_state'];
                 $save_column['OPN_entryAmountCNY'] = floatval($ssje);
                 $save_column['OPN_noticeType'] = 'pay';
+                $save_column['OPN_relatedId'] = '';
             }
             $save_column['OPN_noticeSendStatus'] = 'unsend';
             $save_column['OPN_transactionResult'] = 'completed';

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

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>