|
@@ -32,10 +32,9 @@ class RefillOil extends refill\IRefillOil
|
|
|
$params = $this->req_params($card_no, $params['order_sn'], $params['productid'], $params['province']);
|
|
|
$sign = $this->sign($params);
|
|
|
$params['sign'] = $sign;
|
|
|
-
|
|
|
$params = json_encode($params);
|
|
|
- $resp = http_post_data(config::ORDER_URL, $params , config::ExtHeaders, $net_errno);
|
|
|
|
|
|
+ $resp = http_post_data(config::ORDER_URL, $params , config::ExtHeaders, $net_errno);
|
|
|
if (empty($resp)) {
|
|
|
return [false, '系统错误', true];
|
|
|
}
|
|
@@ -77,9 +76,11 @@ class RefillOil extends refill\IRefillOil
|
|
|
if (empty($resp)) {
|
|
|
return [false, '系统错误', ''];
|
|
|
}
|
|
|
- else {
|
|
|
+ else
|
|
|
+ {
|
|
|
$offical_sn = '';
|
|
|
$status = $resp['status'];
|
|
|
+
|
|
|
if ($status === 2) {
|
|
|
$offical_sn = $resp['voucher'];
|
|
|
$updata['official_sn'] = $offical_sn;
|
|
@@ -89,11 +90,12 @@ class RefillOil extends refill\IRefillOil
|
|
|
$order_state = ORDER_STATE_CANCEL;
|
|
|
} elseif ($status === 1) {
|
|
|
$order_state = ORDER_STATE_SEND;
|
|
|
- } elseif ($status === 4 && (time() - $refill_info['commit_time'] > 300)) {
|
|
|
+ } elseif ($status === 4 && (time() - $refill_info['commit_time'] > 600)) {
|
|
|
$order_state = ORDER_STATE_NOEXIST;
|
|
|
} else {
|
|
|
return [false, $status, $offical_sn];
|
|
|
}
|
|
|
+
|
|
|
return [true, $order_state, $offical_sn];
|
|
|
}
|
|
|
}
|
|
@@ -130,7 +132,7 @@ class RefillOil extends refill\IRefillOil
|
|
|
{
|
|
|
$key = config::KEY;
|
|
|
$content = "mchid={$params['mchid']}&orderid={$params['orderid']}&number={$params['number']}&productid={$params['productid']}";
|
|
|
- $content .= "×tamp={$params['timestamp']}&youka={$params['youka']}&key={$key}";
|
|
|
+ $content .= "×tamp={$params['timestamp']}&youka={$params['youka']}&key=$key";
|
|
|
return md5($content);
|
|
|
}
|
|
|
|