查出OPI_DEI_SN, todo: APP组的是否忽略通知

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 2 0 as order_type,COLI_SN,COLI_ID,COLI_GRI_SN,OPI_Email,OPI_FirstName,OPI_SN,OPI_Name,COLI_WebCode,COLI_Department,COLI_PayManner,COLI_State $fieldsql from BIZ_ConfirmLineInfo
+            $sql = "SELECT TOP 2 0 as order_type,COLI_SN,COLI_ID,COLI_GRI_SN,OPI_Email,OPI_FirstName,OPI_SN,OPI_Name,OPI_DEI_SN,COLI_WebCode,COLI_Department,COLI_PayManner,COLI_State $fieldsql from BIZ_ConfirmLineInfo
                             LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN
                where COLI_ID =?  order by CHARINDEX('50',COLI_State) asc"; // and COLI_State<>50
             $query = $this->HT->query($sql, array($COLI_ID));
@@ -27,7 +27,7 @@ class Paypal_model extends CI_Model {
         }
         //后查传统订单的原因是因为传统订单的订单号去掉外联名字首字母后可能会和商务订单的重合。
         if (empty($result) && ($ordertype == 'T')) {
-            $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,COLI_GRI_SN,OPI_SN,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from ConfirmLineInfo
+            $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,COLI_GRI_SN,OPI_SN,OPI_Email,OPI_FirstName,OPI_Name,OPI_DEI_SN,COLI_WebCode,COLI_State $fieldsql from ConfirmLineInfo
                            LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN
                    where RTRIM(COLI_ID) like '%$COLI_ID'
                    order by CHARINDEX('$COLI_ID', COLI_ID)  ";
@@ -41,7 +41,7 @@ class Paypal_model extends CI_Model {
         //查传统订单add_code，网前实时支付会先生成一个临时订单号存在add_code里，如订单45103248
 
         if (empty($result) && ($ordertype == 'M')) {
-            $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,COLI_GRI_SN,OPI_SN,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo
+            $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,COLI_GRI_SN,OPI_SN,OPI_Email,OPI_FirstName,OPI_Name,OPI_DEI_SN,COLI_WebCode $fieldsql from ConfirmLineInfo
           LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN
           where COLI_AddCode =? ";
             $query = $this->HT->query($sql, array($COLI_ID));
@@ -49,7 +49,7 @@ class Paypal_model extends CI_Model {
         }
 
         if (empty($result) && ($ordertype == 'M')) {
-            $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,COLI_GRI_SN,OPI_SN,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo cli
+            $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,COLI_GRI_SN,OPI_SN,OPI_Email,OPI_FirstName,OPI_Name,OPI_DEI_SN,COLI_WebCode $fieldsql from ConfirmLineInfo cli
           LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN
           where
                 EXISTS (
@@ -65,7 +65,7 @@ class Paypal_model extends CI_Model {
 
         //订单号查询不到尝试使用团号查询
         if (empty($result) && $ordertype == 'B') {
-            $sql = "SELECT TOP 2 0 as order_type,COLI_SN,COLI_ID,COLI_GRI_SN,OPI_SN,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_Department,COLI_State $fieldsql from BIZ_ConfirmLineInfo
+            $sql = "SELECT TOP 2 0 as order_type,COLI_SN,COLI_ID,COLI_GRI_SN,OPI_SN,OPI_Email,OPI_FirstName,OPI_Name,OPI_DEI_SN,COLI_WebCode,COLI_Department,COLI_State $fieldsql from BIZ_ConfirmLineInfo
                             LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN
                where COLI_GroupCode like '%-$COLI_ID%' order by CHARINDEX('50',COLI_State) asc";
             $query = $this->HT->query($sql);
@@ -92,10 +92,10 @@ class Paypal_model extends CI_Model {
      */
     public function get_group_accout_info($coli_sn, $pn_txn_id) {
         // select * from BIZ_GroupAccountInfo where GAI_COLI_SN = 559007281 and GAI_AccreditNo = '91R84932UM059045C'
-        $info_sql = "select GAI_SN, GAI_State from BIZ_GroupAccountInfo 
+        $info_sql = "select GAI_SN, GAI_State from BIZ_GroupAccountInfo
         where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'
         union
-        select GAI_SN, GAI_State from GroupAccountInfo 
+        select GAI_SN, GAI_State from GroupAccountInfo
         where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'";
 
         $info_query = $this->HT->query($info_sql);