Merge branch 'feature/pay'

webht/third_party/pay/controllers/AlipayTradeService.php

@@ -357,6 +357,12 @@ class AlipayTradeService extends CI_Controller
                 continue;
             }
 
+            //检测是否是APP订单
+            if ((strpos($item->ALI_memo, 'China Train Booking') !== false) || (strpos($item->ALI_memo, 'ChinaTrainBooking') !== false)) {
+                $item->ALI_orderId .= "_A";
+                // $this->Alipay_note_model->update_send($item->ALI_dealId, 'send');
+            }
+
             //退款状态默认为已经处理，陆燕在退款前手动通知外联了，系统跳过处理
             if ($item->ALI_payType == 'refund') {
                 $this->send_refund($item);
@@ -370,12 +376,6 @@ class AlipayTradeService extends CI_Controller
                 continue;
             }
 
-            //检测是否是APP订单,默认不处理
-            // if ((strpos($item->pn_memo, 'China Train Booking') !== false) || (strpos($item->pn_memo, 'ChinaTrainBooking') !== false)) { //APP自动出票的订单不需要处理
-            //     $this->Alipay_note_model->update_send($item->ALI_dealId, 'send');
-            //     continue;
-            // }
-
             //根据note信息找到订单号
             $orderid_info = analysis_orderid($item->ALI_orderId);
 
@@ -399,7 +399,7 @@ class AlipayTradeService extends CI_Controller
             $this->Alipay_note_model->set_invoice($item->ALI_dealId, $orderid_info->orderid . '_' . $orderid_info->ordertype);
 
             //检测是否是APP订单,默认不处理
-            if ($orderid_info->ordertype == 'A') { //APP自动出票的订单不需要处理
+            if ($orderid_info->ordertype == 'A' && $item->ALI_payType == 'pay') { //APP自动出票的订单不需要处理
                 $this->Alipay_note_model->update_send($item->ALI_dealId, 'send');
                 continue;
             }