for check

helper/refill/api/xyz/nanjingpushang_hf/RefillPhone.php

@@ -18,10 +18,10 @@ class RefillPhone extends refill\IRefillPhone
     {
         [$goods_id, $price] = parent::goods($quality,$amount,$card_type,$regin_no,$other);
         if($goods_id <= 0) return [0,0];
-        $key = "{$card_type}-{$amount}-{$regin_no}";
+        $key = "$card_type-$amount-$regin_no";
         $price = config::Price[$key];
         if(empty($price)) {
-            Log::record("channel cannot find price where name={$this->mName}, goods_id = {$goods_id} card_type={$card_type} amount={$amount} regin_no={$regin_no}",Log::ERR);
+            Log::record("channel cannot find price where name=$this->mName, goods_id = $goods_id card_type=$card_type amount=$amount regin_no=$regin_no",Log::ERR);
             return [0,0];
         } else {
             return [$goods_id,ncPriceFormat($price)];
@@ -63,17 +63,16 @@ class RefillPhone extends refill\IRefillPhone
                 return [false, '网络错误', true];
             }
 
-            $retCode = $resp['code'];
-            if ($retCode === 0) {
+            $code = $resp['code'];
+            if ($code === 0) {
                 return [true, '', false];
             }
-            elseif (in_array($retCode, config::ERR_NOS, true)) {
+            elseif (in_array($code, config::ERR_NOS, true)) {
                 return [false, $resp['msg'], false];
             }
-            else
-            {
+            else {
                 $err = 998;
-                $net_errno = "HTTP-{$err}";
+                $net_errno = "HTTP-$err";
                 return [false, $resp['msg'], true];
             }
         }
@@ -100,28 +99,25 @@ class RefillPhone extends refill\IRefillPhone
                 return [false, '网络错误'];
             }
 
-            $retCode = $resp['code'];
+            $code  = $resp['code'];
             $order = $resp['ext'];
-            if ($retCode === 0)
+            if ($code === 0)
             {
                 $status = $resp['data'];
-                if ($status === 4)
-                {
+                if ($status === 4) {
                     $updata['official_sn'] = $order['exchangeTraded'];
                     Model('refill_order')->edit($refill_info['order_id'], $updata);
                     return [true, ORDER_STATE_SUCCESS];
-                }
-                elseif ($status === 5) {
+                } elseif ($status === 5) {
                     return [true, ORDER_STATE_CANCEL];
-                }
-                elseif ($status === 3) {
+                } elseif ($status === 3) {
                     return [true, ORDER_STATE_SEND];
                 }
-                elseif ($status === 9 && time() - $refill_info['commit_time'] > 600) {
-                    return [true, ORDER_STATE_NOEXIST];
-                }
-                else
-                {
+//9未查到订单（如果下单成功但是未查到订单不可以置为失败，需要进行核对）
+//                elseif ($status === 9 && time() - $refill_info['commit_time'] > 600) {
+//                    return [true, ORDER_STATE_NOEXIST];
+//                }
+                else {
                     return [false, $order['rechargeFailedReason']];
                 }
             }
@@ -148,16 +144,12 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
-            if (empty($resp))
-            {
+            if (empty($resp)) {
                 return [false, '网络错误'];
-            }
-            elseif ($resp['code'] === 0) {
+            } elseif ($resp['code'] === 0) {
                 $account = $resp['ext'];
                 return [true, $account['balance']];
-            }
-            else
-            {
+            } else {
                 return [false, $resp['msg']];
             }
         }

helper/refill/api/xyz/nanjingpushang_oil/RefillOil.php

@@ -50,15 +50,12 @@ class RefillOil extends refill\IRefillOil
                 return [false, '网络错误', true];
             }
 
-            $retCode = $resp['code'];
-            if ($retCode === 0) {
+            $code = $resp['code'];
+            if ($code === 0) {
                 return [true, '', false];
-            }
-            elseif (in_array($retCode, config::ERR_NOS, true)) {
+            } elseif (in_array($code, config::ERR_NOS, true)) {
                 return [false, $resp['msg'], false];
-            }
-            else
-            {
+            } else {
                 $err = 998;
                 $net_errno = "HTTP-{$err}";
                 return [false, $resp['msg'], true];
@@ -87,28 +84,26 @@ class RefillOil extends refill\IRefillOil
                 return [false, '网络错误'];
             }
 
-            $retCode = $resp['code'];
+            $code = $resp['code'];
             $order = $resp['ext'];
-            if ($retCode === 0)
+            if ($code === 0)
             {
                 $status = $resp['data'];
-                if ($status === 4)
-                {
+
+                if ($status === 4) {
                     $updata['official_sn'] = $order['exchangeTraded'];
                     Model('refill_order')->edit($refill_info['order_id'], $updata);
                     return [true, ORDER_STATE_SUCCESS];
-                }
-                elseif ($status === 5) {
+                } elseif ($status === 5) {
                     return [true, ORDER_STATE_CANCEL];
-                }
-                elseif ($status === 3) {
+                } elseif ($status === 3) {
                     return [true, ORDER_STATE_SEND];
                 }
-                elseif ($status === 9 && time() - $refill_info['commit_time'] > 600) {
-                    return [true, ORDER_STATE_NOEXIST];
-                }
-                else
-                {
+//9未查到订单（如果下单成功但是未查到订单不可以置为失败，需要进行核对）
+//                elseif ($status === 9 && time() - $refill_info['commit_time'] > 600) {
+//                    return [true, ORDER_STATE_NOEXIST];
+//                }
+                else {
                     return [false, $order['rechargeFailedReason']];
                 }
             }
@@ -135,16 +130,12 @@ class RefillOil extends refill\IRefillOil
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
-            if (empty($resp))
-            {
+            if (empty($resp)) {
                 return [false, '网络错误'];
-            }
-            elseif ($resp['code'] === 0) {
+            } elseif ($resp['code'] === 0) {
                 $account = $resp['ext'];
                 return [true, $account['balance']];
-            }
-            else
-            {
+            } else {
                 return [false, $resp['msg']];
             }
         }