stanley-king 1 anno fa
parent
commit
bcad4c7fd9

+ 7 - 9
helper/refill/api/mh/lifang_normal/RefillPhone.php

@@ -4,10 +4,8 @@ namespace refill\lifang_normal;
 
 require_once(BASE_HELPER_RAPI_PATH . '/lifang_normal/config.php');
 
-use mtopcard;
 use refill;
 use Log;
-use refill\lifang_normal\config;
 
 class RefillPhone extends refill\IRefillPhone
 {
@@ -23,12 +21,11 @@ class RefillPhone extends refill\IRefillPhone
             'outOrderId'    => $order_sn,
             'phoneNumber'   => $phone,
             'requestDate'   => config::time_stamp(),
+            'callBackUrl'   => config::NOTIFY_URL
         ];
 
-        $input =  config::gen_params($input,config::add_keys);
-        $input['callBackUrl'] = config::NOTIFY_URL;
-
-        return  $input;
+        $params =  config::gen_params($input,config::add_keys);
+        return  $params;
     }
 
     //[$state, $errmsg, $neterr]
@@ -64,7 +61,6 @@ class RefillPhone extends refill\IRefillPhone
             'outOrderId'  => $refill_info['order_sn'],
             'requestDate' => config::time_stamp()
         ];
-
         $params = config::gen_params($input,config::query_keys);
 
         $resp = http_request(config::QUERY_URL, $params , 'POST');
@@ -101,8 +97,10 @@ class RefillPhone extends refill\IRefillPhone
 
                 return [true, $order_state, $official_sn];
             }
-            else
-            {
+            elseif($code === 80001 and (time() - $refill_info['commit_time']) >= 300) {
+                return [true, ORDER_STATE_NOEXIST, ''];
+            }
+            else {
                 return [false, $resp['msg']];
             }
         }

+ 3 - 4
helper/refill/api/mh/lifang_normal/config.php

@@ -21,17 +21,17 @@ class config
         $str = '';
         foreach ($keys as $key)
         {
+            $str .= $key;
             if($key == 'accessToken') {
-                $str .= $key.config::accessToken;
+                $str .= config::accessToken;
             }
             else {
                 $val = $params[$key] ?? '';
-                $str .= $key.$val;
+                $str .= $val;
             }
         }
 
         $str .= self::appSecret;
-
         return strtoupper(md5($str));
     }
 
@@ -41,7 +41,6 @@ class config
         $params['accessToken'] = config::accessToken;
         return $params;
     }
-
     public static function time_stamp ()
     {
         return date('YmdHis', time());