From ac30f56cac921fe8ff72c1aeabfac5f700b36b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= Date: Mon, 27 Dec 2021 13:26:10 +0800 Subject: [PATCH] Update --- app/Models/Message.php | 3 +-- app/Services/AfterSaleService.php | 5 ++--- app/helpers.php | 12 ++++++++++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/Models/Message.php b/app/Models/Message.php index 9712ffde..a10500cd 100644 --- a/app/Models/Message.php +++ b/app/Models/Message.php @@ -3,7 +3,6 @@ namespace App\Models; use App\Casts\JsonArray; -use App\Helpers\Order as OrderHelper; use Dcat\Admin\Traits\HasDateTimeFormatter; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; @@ -85,7 +84,7 @@ class Message extends Model { //填入推送内容 PushMessageTask::create([ - 'sn' => OrderHelper::serialNumber(), + 'sn' => serial_number(), 'message_id' => $this->id, 'message_type' => $this::class, ]); diff --git a/app/Services/AfterSaleService.php b/app/Services/AfterSaleService.php index 00abb9e9..27e39c37 100644 --- a/app/Services/AfterSaleService.php +++ b/app/Services/AfterSaleService.php @@ -4,7 +4,6 @@ namespace App\Services; use App\Admin\Services\OrderService; use App\Exceptions\BizException; -use App\Helpers\Order as OrderHelper; use App\Models\AfterSale; use App\Models\AfterSaleLog; use App\Models\DistributionPreIncomeJob; @@ -333,7 +332,7 @@ class AfterSaleService //执行实际退款操作; if ($afterSale->amount > 0) {//退款金额大于0才做实际退款 $order->refundLogs()->create([ - 'sn' => OrderHelper::serialNumber(), + 'sn' => serial_number(), 'amount' => $afterSale->amount, 'reason' => '售后退款', ]); @@ -343,7 +342,7 @@ class AfterSaleService //复制一个订单(存商品价格,支付价格为0;) $changeOrder = new Order(); $changeOrder->user_id = $order->user_id; - $changeOrder->sn = OrderHelper::serialNumber(); + $changeOrder->sn = serial_number(); $changeOrder->products_total_amount = bcmul($afterSale->orderProduct->sell_price, $afterSale->num); $changeOrder->coupon_discount_amount = 0; $changeOrder->vip_discount_amount = bcmul(($afterSale->orderProduct->sell_price-$afterSale->orderProduct->vip_price), $afterSale->num); diff --git a/app/helpers.php b/app/helpers.php index 3ae4585c..90febd2c 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -25,3 +25,15 @@ if (! function_exists('app_settings')) { return app(SettingService::class)->get($key, $default); } } + +if (! function_exists('serial_number')) { + /** + * 生成流水号 + * + * @return string + */ + function serial_number(): string + { + return date('YmdHis').sprintf('%06d', mt_rand(1, 999999)); + } +}