diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php index 3c1087e5d..00bc73fd4 100644 --- a/crmeb/app/api/controller/v1/order/StoreOrderController.php +++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php @@ -260,7 +260,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) { diff --git a/crmeb/app/services/order/StoreOrderCreateServices.php b/crmeb/app/services/order/StoreOrderCreateServices.php index 40d6edcf4..c9afb8baa 100644 --- a/crmeb/app/services/order/StoreOrderCreateServices.php +++ b/crmeb/app/services/order/StoreOrderCreateServices.php @@ -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'); diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php index cfb69597c..d3d3f0ba3 100644 --- a/crmeb/app/services/order/StoreOrderServices.php +++ b/crmeb/app/services/order/StoreOrderServices.php @@ -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) {