From 4fc71a482758ccbce123ea0f573bbc442bb7b89d Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Sun, 15 Jul 2018 13:15:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E6=97=85=E7=9A=84?=
 =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E4=BB=98=E6=AC=BE=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/pay/controllers/AlipayTradeService.php | 4 +++-
 webht/third_party/pay/models/Alipay_model.php            | 2 +-
 webht/third_party/paypal/models/paypal_model.php         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php
index 78cc680b..e0cd7ccf 100644
--- a/webht/third_party/pay/controllers/AlipayTradeService.php
+++ b/webht/third_party/pay/controllers/AlipayTradeService.php
@@ -402,7 +402,9 @@ class AlipayTradeService extends CI_Controller
                             $ht_memo
                         );
                         // 更新订单主表付款方式,防止没访问thankyou-train.asp
-                        $this->Alipay_model->update_paymanner($GAI_COLI_SN);
+                        if (empty($advisor_info->COLI_PayManner)) {
+                            $this->Alipay_model->update_paymanner($GAI_COLI_SN);
+                        }
                         if ($advisor_info->COLI_Department == 10) {
                             // 把订单状态设置为13-新订单已支付
                             $this->Alipay_model->update_biz_coli_state($GAI_COLI_SN, 13);
diff --git a/webht/third_party/pay/models/Alipay_model.php b/webht/third_party/pay/models/Alipay_model.php
index 64b46a60..97600764 100644
--- a/webht/third_party/pay/models/Alipay_model.php
+++ b/webht/third_party/pay/models/Alipay_model.php
@@ -18,7 +18,7 @@ class Alipay_model extends CI_Model {
         $fieldsql = $orderinfo == false ? '' : " ,* ";
         //先查商务订单B,APP订单A、再查传统订单T
         if ($ordertype == 'B' || $ordertype == 'A') {
-            $sql = "SELECT TOP 1 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_Department,COLI_State $fieldsql from BIZ_ConfirmLineInfo
+            $sql = "SELECT TOP 1 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_Department,COLI_PayManner,COLI_State $fieldsql from BIZ_ConfirmLineInfo
                             LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN
                where COLI_ID =?";
             $query = $this->HT->query($sql, array($COLI_ID));
diff --git a/webht/third_party/paypal/models/paypal_model.php b/webht/third_party/paypal/models/paypal_model.php
index 09695d8b..73101e6a 100644
--- a/webht/third_party/paypal/models/paypal_model.php
+++ b/webht/third_party/paypal/models/paypal_model.php
@@ -19,7 +19,7 @@ class Paypal_model extends CI_Model {
         $fieldsql = $orderinfo == false ? '' : " ,* ";
         //先查商务订单B,APP订单A、再查传统订单T
         if ($ordertype == 'B' || $ordertype == 'A') {
-            $sql = "SELECT TOP 1 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_Department,COLI_State $fieldsql from BIZ_ConfirmLineInfo
+            $sql = "SELECT TOP 1 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_Department,COLI_PayManner,COLI_State $fieldsql from BIZ_ConfirmLineInfo
                             LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN
                where COLI_ID =?";
             $query = $this->HT->query($sql, array($COLI_ID));