|
|
@@ -179,7 +179,7 @@ class PaymentService extends BaseService
|
|
|
$outTradeNo = isset($order['order_no']) && $order['order_no'] ? $order['order_no'] : get_order_num('PR');
|
|
|
// 是否调用过支付,是则用新的支付单号
|
|
|
if ($outTradeNo && $this->model->where(['out_trade_no' => $outTradeNo, 'mark' => 1])->value('id')) {
|
|
|
- $outTradeNo = $outTradeNo . date('is') . rand(1, 9);
|
|
|
+ $outTradeNo = $outTradeNo . date('s') . rand(1, 9);
|
|
|
}
|
|
|
$body = isset($order['body']) ? $order['body'] : '';
|
|
|
$payData = [
|
|
|
@@ -250,7 +250,7 @@ class PaymentService extends BaseService
|
|
|
$outTradeNo = isset($order['order_no']) && $order['order_no'] ? $order['order_no'] : get_order_num('PR');
|
|
|
// 是否调用过支付,是则用新的支付单号
|
|
|
if ($outTradeNo && $this->model->where(['out_trade_no' => $outTradeNo, 'mark' => 1])->value('id')) {
|
|
|
- $outTradeNo = $outTradeNo . date('is') . rand(1, 9);
|
|
|
+ $outTradeNo = $outTradeNo . date('s') . rand(1, 9);
|
|
|
}
|
|
|
$body = isset($order['body']) ? $order['body'] : '';
|
|
|
$type = isset($order['type']) ? $order['type'] : 0;
|
|
|
@@ -318,7 +318,7 @@ class PaymentService extends BaseService
|
|
|
// 是否调用过支付,是则用新的支付单号
|
|
|
$outTradeNo = isset($order['order_no']) && $order['order_no'] ? $order['order_no'] : get_order_num('PY');
|
|
|
if ($outTradeNo && $this->model->where(['out_trade_no' => $outTradeNo, 'mark' => 1])->value('id')) {
|
|
|
- $outTradeNo = $outTradeNo . date('is') . rand(1, 9);
|
|
|
+ $outTradeNo = $outTradeNo . date('s') . rand(1, 9);
|
|
|
}
|
|
|
$body = isset($order['body']) ? $order['body'] : '';
|
|
|
$payData = [
|