更新商旅的主表付款方式

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

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

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