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

helper/refill/RefillBase.php

@@ -942,7 +942,7 @@ class RefillBase
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         $mod_order = Model('vr_order');
         $order_info = $mod_order->partition(util::part_notify())->getOrderInfo(['order_id' => $order_id]);
-        if (empty($order_info) || $order_info['order_state'] != ORDER_STATE_PAY) return false;
+        if (empty($order_info)) return false;
 
         $mod_refill = Model('refill_order');
         $refill_info = $mod_refill->partition(util::part_notify())->getOrderInfo(['order_id' => $order_id,'inner_status' => 0]);

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

@@ -44,6 +44,7 @@ class RefillPhone extends refill\IRefillPhone
             return [false, '省份获取错误', false];
         }
 
+        $order_sn = $params['order_sn'];
         $params = $this->req_params($card_no, $amount, $card_type, $params['order_sn'], $regin_no);
         $sign = config::sign($params);
         $params['sign'] = $sign;
@@ -61,7 +62,7 @@ class RefillPhone extends refill\IRefillPhone
             if (empty($resp)) {
                 return [false, '系统错误', true];
             } elseif ($resp['code'] === 1000) {
-                Model()->table('refill_order')->where(['order_sn' => $params['order_sn']])->update(['official_sn' => $resp['data']['charge_id']]);
+                Model()->table('refill_order')->where(['order_sn' => $order_sn])->update(['official_sn' => $resp['data']['charge_id']]);
                 return [true, $resp['data']['order_sn'], false];
             } else {
                 return [false, $resp['msg'], false];

test/TestRefund.php

@@ -147,8 +147,8 @@ class TestRefund extends TestCase
 
         $provider = $getProvider('by_online');
 
-        $order_sn = '94021685232830341599';
+        $order_sn = '2894080738681963430041';
 //        $order_sn = '54821685230140381770';
-        [$succ, $resp] = $provider->query(['order_sn' => $order_sn, 'official_sn' => '1123052862339278']);
+        [$succ, $resp] = $provider->query(['order_sn' => $order_sn, 'official_sn' => '1123052962366637']);
     }
 }