pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

Update

release
李静 2021-12-27 13:26:10 +08:00
parent 05f01969fd
commit ac30f56cac
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/Message.php
View File

@ -3,7 +3,6 @@
namespace App\Models; namespace App\Models;
use App\Casts\JsonArray; use App\Casts\JsonArray;
use App\Helpers\Order as OrderHelper;
use Dcat\Admin\Traits\HasDateTimeFormatter; use Dcat\Admin\Traits\HasDateTimeFormatter;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
@ -85,7 +84,7 @@ class Message extends Model
{ {
//填入推送内容 //填入推送内容
PushMessageTask::create([ PushMessageTask::create([
'sn' => OrderHelper::serialNumber(), 'sn' => serial_number(),
'message_id' => $this->id, 'message_id' => $this->id,
'message_type' => $this::class, 'message_type' => $this::class,
]); ]);

5
app/Services/AfterSaleService.php
View File

@ -4,7 +4,6 @@ namespace App\Services;
use App\Admin\Services\OrderService; use App\Admin\Services\OrderService;
use App\Exceptions\BizException; use App\Exceptions\BizException;
use App\Helpers\Order as OrderHelper;
use App\Models\AfterSale; use App\Models\AfterSale;
use App\Models\AfterSaleLog; use App\Models\AfterSaleLog;
use App\Models\DistributionPreIncomeJob; use App\Models\DistributionPreIncomeJob;
@ -333,7 +332,7 @@ class AfterSaleService
//执行实际退款操作； //执行实际退款操作；
if ($afterSale->amount > 0) {//退款金额大于0才做实际退款 if ($afterSale->amount > 0) {//退款金额大于0才做实际退款
$order->refundLogs()->create([ $order->refundLogs()->create([
'sn' => OrderHelper::serialNumber(), 'sn' => serial_number(),
'amount' => $afterSale->amount, 'amount' => $afterSale->amount,
'reason' => '售后退款', 'reason' => '售后退款',
]); ]);
@ -343,7 +342,7 @@ class AfterSaleService
//复制一个订单（存商品价格，支付价格为0;） //复制一个订单（存商品价格，支付价格为0;）
$changeOrder = new Order(); $changeOrder = new Order();
$changeOrder->user_id = $order->user_id; $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->products_total_amount = bcmul($afterSale->orderProduct->sell_price, $afterSale->num);
$changeOrder->coupon_discount_amount = 0; $changeOrder->coupon_discount_amount = 0;
$changeOrder->vip_discount_amount = bcmul(($afterSale->orderProduct->sell_price-$afterSale->orderProduct->vip_price), $afterSale->num); $changeOrder->vip_discount_amount = bcmul(($afterSale->orderProduct->sell_price-$afterSale->orderProduct->vip_price), $afterSale->num);

12
app/helpers.php
View File

@ -25,3 +25,15 @@ if (! function_exists('app_settings')) {
return app(SettingService::class)->get($key, $default); 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));
}
}