Merge branch 'feature/pay'

webht/third_party/paypal/models/paypal_model.php

@@ -162,7 +162,10 @@ class Paypal_model extends CI_Model {
             IF NOT EXISTS(
                    SELECT TOP 1 1
                    FROM   BIZ_GroupAccountInfo
-                   WHERE  GAI_COLI_SN = ? AND GAI_SQJE=? AND DeleteFlag=0 AND GAI_Type='15010'
+                   WHERE  GAI_COLI_SN = ? AND DeleteFlag=0 AND GAI_Type='15010'
+                   (GAI_AccreditNo IS NULL AND GAI_SQJE=?  )
+                   OR
+                   (GAI_AccreditNo='$GAI_AccreditNo')
                )
             INSERT INTO BIZ_GroupAccountInfo (
                         GAI_COLI_SN