Merge branch 'rmaster' of 39.97.239.116:gyfl/xyzshop into rmaster

helper/refill/api/xyz/gftd/config.php

@@ -14,5 +14,5 @@ class config
 
     const NOTIFY_URL =  BASE_SITE_URL."/mobile/refill_gftd.php";
     const ExtHeaders = ['Content-Type: application/json;charset=UTF-8;','Accept:application/json;charset=UTF-8;'];
-    const BlackMsgs = ["只能给绑定正确手机号的油卡充值或只能给主卡充值","只能给主卡且卡状态正常的加油卡充值","加油卡卡号错误或不支持"];
+    const BlackMsgs = ["只能给主卡且卡状态正常的加油卡充值","加油卡卡号错误或不支持"];
 }

helper/refill/api/xyz/gftdsinop/config.php

@@ -14,5 +14,5 @@ class config
 
     const NOTIFY_URL =  BASE_SITE_URL."/mobile/refill_gftd.php";
     const ExtHeaders = ['Content-Type: application/json;charset=UTF-8;','Accept:application/json;charset=UTF-8;'];
-    const BlackMsgs = ["只能给绑定正确手机号的油卡充值或只能给主卡充值","只能给主卡且卡状态正常的加油卡充值","加油卡卡号错误或不支持"];
+    const BlackMsgs = ["只能给主卡且卡状态正常的加油卡充值","加油卡卡号错误或不支持"];
 }

helper/refill/util.php

@@ -39,9 +39,13 @@ class util
             else {
                 $latest = current($result);
                 $cur = time();
-                $success = ($cur - $latest) > 600;
+                $success = ($cur - $latest) > 120;
 
-                return [$success, $latest +  600 - $cur];
+                if($success) {
+                    wcache("card_expired",[$card_no => time()],'');
+                }
+
+                return [$success, $latest +  120 - $cur];
             }
         }
         else {

mobile/control/merchant_refill.php

@@ -99,7 +99,7 @@ class merchant_refillControl extends mbMerchantControl
                     'card_no' => $no,
                     'mch_order' => "",
                     'notify_url' => ""];
-                
+
                 $card_type = mtopcard\simple_card_type($no);
                 if($card_type === mtopcard\SinopecCard || $card_type === mtopcard\PetroChinaCard)
                 {