stanley-king пре 3 година
родитељ
комит
f4e447412a
1 измењених фајлова са 21 додато и 25 уклоњено
  1. 21 25
      helper/refill/api/xyz/zhenqi/RefillPhone.php

+ 21 - 25
helper/refill/api/xyz/zhenqi/RefillPhone.php

@@ -51,26 +51,16 @@ class RefillPhone extends refill\IRefillPhone
             if (empty($resp)) {
                 return [false, '系统错误', true];
             }
-            elseif($status === 1)
+            elseif ($status === 1) {
+                return [true, '', false];
+            }
+            else
             {
-                $status = intval($resp['status']);
-                if($status === 1) {
-                    $data = $this->decrypt($resp['data']['json_data']);
-                    Log::record("zhenqi add status 0 data:{$data}", Log::DEBUG);
-                    $data = json_decode($data,true);
-                    return [true, $data['out_trade_no'], false];
-                }
-                else
-                {
-                    $sub_code = $resp['sub_code'];
-                    if (($sub_code >= 100 && $sub_code <= 200)) {
-                        $data = $this->decrypt($resp['data']['json_data']);
-                        Log::record("zhenqi add status 1 sub_code:{$sub_code}, data:{$data}", Log::DEBUG);
-                        $data = json_decode($data, true);
-                        return [true, $data['out_trade_no'], false];
-                    } else {
-                        return [false, $resp['info'], false];
-                    }
+                $sub_code = $resp['sub_code'];
+                if (($sub_code >= 100 && $sub_code <= 200)) {
+                    return [true, '', false];
+                } else {
+                    return [false, $resp['info'], false];
                 }
             }
         }
@@ -93,6 +83,7 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
+
             if (empty($resp)) {
                 return [false, '系统错误'];
             }
@@ -100,8 +91,15 @@ class RefillPhone extends refill\IRefillPhone
             {
                 $data = $this->decrypt($resp['data']['json_data']);
                 Log::record("zhenqi order query status 1 data:{$data}", Log::DEBUG);
-                $data = json_decode($data,true);
+
+                $data   = json_decode($data,true);
                 $status = intval($data['status']);
+                $info   = $resp['info'];
+
+                if ($resp['sub_code'] != 0) {
+                    return [false, $info];
+                }
+
                 if ($status === 1) {
                     $updata['official_sn'] = $data['sp_order_no'];
                     Model('refill_order')->edit($refill_info['order_id'], $updata);
@@ -111,16 +109,14 @@ class RefillPhone extends refill\IRefillPhone
                 } elseif ($status === 3) {
                     $order_state = ORDER_STATE_SEND;
                 } else {
-                    return [false, $status];
+                    return [false, $info];
                 }
                 return [true, $order_state];
             }
-            elseif ($resp['sub_code'] == 1210)
-            {
+            elseif ($resp['sub_code'] == 1210) {
                 return [true, ORDER_STATE_NOEXIST];
             }
-            else
-            {
+            else {
                 return [false, $resp['info']];
             }
         }