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

webht/third_party/pay/models/Online_payment_account_model.php

@@ -366,9 +366,9 @@ class Online_payment_account_model extends CI_Model {
             inner join BIZ_ConfirmLineDetail cold on COLD_COLI_SN=COLI_SN and isnull(cold.DeleteFlag,0)=0
             where COLI_GRI_SN=?
             and COLD_StartDate<?";
-            return $this->HT->query($sql, array($gri_sn,$late_date))->num_rows() > 0;
         }
-        return false;
+        return $this->HT->query($sql, array($gri_sn,$late_date))->num_rows() > 0;
+        // return false;
     }
 
     /*!

webht/third_party/paypal/models/paypal_model.php

@@ -710,8 +710,8 @@ class Paypal_model extends CI_Model {
             inner join BIZ_ConfirmLineDetail cold on COLD_COLI_SN=COLI_SN and isnull(cold.DeleteFlag,0)=0
             where COLI_GRI_SN=?
             and COLD_StartDate<?";
-            return $this->HT->query($sql, array($gri_sn,$late_date))->num_rows() > 0;
         }
-        return false;
+        return $this->HT->query($sql, array($gri_sn,$late_date))->num_rows() > 0;
+        // return false;
     }
 }