github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-31 15:00:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复支付宝支付问题

Browse Source
This commit is contained in:
吴昊天 2023-03-15 17:37:22 +08:00
parent 621651704d
commit 6f984c5f3a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/app/api/controller/v1/order/StoreOrderController.php
View File

@ -262,7 +262,7 @@ class StoreOrderController
}
//重新生成订单号去支付
$order['order_id'] = mt_rand(100, 999) . '_' . $order['order_id'];
// $order['order_id'] = mt_rand(100, 999) . '_' . $order['order_id'];
//0元支付
if (bcsub((string)$orderInfo['pay_price'], '0', 2) <= 0) {

6
crmeb/app/services/order/StoreOrderCreateServices.php
View File

@ -75,11 +75,11 @@ class StoreOrderCreateServices extends BaseServices
$id = $snowflake->setStartTimeStamp(strtotime('2022-01-01') * 1000)->id();
}
$replace = '';
$chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
for ($i = 0; $i < 3; $i++) {
$chars = '0123456789';
for ($i = 0; $i < 6; $i++) {
$replace .= $chars[mt_rand(0, strlen($chars) - 1)];
}
$id = substr_replace($id, $replace, -3);
$id = substr_replace($id, $replace, -6);
} else {
$is_callable = function ($currentTime) {
$redis = Cache::store('redis');

2
crmeb/app/services/order/StoreOrderServices.php
View File

@ -768,7 +768,7 @@ HTML;
}
/** @var StoreOrderCreateServices $createServices */
$createServices = app()->make(StoreOrderCreateServices::class);
$data['order_id'] = $createServices->getNewOrderId();
$data['order_id'] = $createServices->getNewOrderId('cp');
/** @var StoreOrderStatusServices $services */
$services = app()->make(StoreOrderStatusServices::class);
return $this->transaction(function () use ($id, $data, $services) {