huiyuan remove official_sn check

helper/refill/api/xyz/huiyuan/RefillCallBack.php

@@ -31,20 +31,19 @@ class RefillCallBack implements refill\IRefillCallBack
         $order_sn = $params['bill_id'];
         $order_info = Model('vr_order')->getOrderInfoForNotify(['order_sn' => $order_sn]);
         if (empty($order_info)) {
-            return [false, false, false, false, ''];
+            return [false, false, false, false];
         }
 
-        $official_sn = '';
         $order_id = $order_info['order_id'];
         if ($status === '成功') {
             $official_sn = strtolower($params['operator_bill_no']) == 'null' ? '' : $params['operator_bill_no'];
             $data['official_sn'] = $official_sn;
             Model('refill_order')->edit($order_id, $data);
-            return [$order_id, true, false, true, $official_sn];
+            return [$order_id, true, false, true];
         } elseif ($status === '失败') {
-            return [$order_id, false, true, true, $official_sn];
+            return [$order_id, false, true, true];
         } else {
-            return [$order_id, false, false, false, $official_sn];
+            return [$order_id, false, false, false];
         }
     }
 }

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

@@ -99,17 +99,16 @@ class RefillPhone extends refill\IRefillPhone
 
         $resp = http_request(config::QUERY_URL, $params, 'POST', false, config::ExtHeaders);
         if (empty($resp)) {
-            return [false, '网络错误', ''];
+            return [false, '网络错误'];
         }
         else
         {
             $resp = $this->decode_tag($resp);
             if (empty($resp)) {
-                return [false, '网络错误', ''];
+                return [false, '网络错误'];
             }
             elseif ($resp['ret_code'] === '0')
             {
-                $official_sn = '';
                 $status = $resp['bill_status'];
                 if ($status === '成功') {
                     $official_sn = $resp['operator_bill_no'];
@@ -121,25 +120,25 @@ class RefillPhone extends refill\IRefillPhone
                 } elseif ($status === '处理中') {
                     $order_state = ORDER_STATE_SEND;
                 } else {
-                    return [false, $resp['ret_msg'], $official_sn];
+                    return [false, $resp['ret_msg']];
                 }
-                return [true, $order_state, $official_sn];
+                return [true, $order_state];
             }
             elseif ($resp['ret_code'] === '-1')
             {
                 if ($resp['bill_status'] === '失败' || $resp['ret_msg'] === '接口单失败') {
-                    return [true, ORDER_STATE_CANCEL, ''];
+                    return [true, ORDER_STATE_CANCEL];
                 }else{
-                    return [false, $resp['ret_msg'], ''];
+                    return [false, $resp['ret_msg']];
                 }
             }
             elseif ($resp['ret_code'] === '8' && (time() - $refill_info['commit_time'] >= 600))
             {
-                return [true, ORDER_STATE_NOEXIST, ''];
+                return [true, ORDER_STATE_NOEXIST];
             }
             else
             {
-                return [false, $resp['ret_msg'], ''];
+                return [false, $resp['ret_msg']];
             }
         }
     }