From 1894cd78bd1d53876e83b945248e216359aec849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= Date: Tue, 28 Dec 2021 13:09:42 +0800 Subject: [PATCH] WIP --- app/Console/Commands/OrderRefundCommand.php | 16 ++++++++++++++-- app/Models/BalanceLog.php | 3 ++- app/Models/WalletLog.php | 3 ++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/Console/Commands/OrderRefundCommand.php b/app/Console/Commands/OrderRefundCommand.php index 848f7299..a3e5fdd6 100644 --- a/app/Console/Commands/OrderRefundCommand.php +++ b/app/Console/Commands/OrderRefundCommand.php @@ -97,7 +97,13 @@ class OrderRefundCommand extends Command { $order = $log->order; - (new WalletService())->changeBalance($order->user, $order->total_amount, WalletLog::ACTION_ORDER_CANCELLED, '订单-取消', $order); + (new WalletService())->changeBalance( + $order->user, + $order->total_amount, + $log->after_sale_id ? WalletLog::ACTION_ORDER_AFTER_SALE : WalletLog::ACTION_ORDER_CANCELLED, + $log->after_sale_id ? '订单-售后退款' : $log->reason, + $order + ); $log->update([ 'status' => OrderRefundLog::STATUS_SUCCESS, @@ -115,7 +121,13 @@ class OrderRefundCommand extends Command { $order = $log->order; - (new BalanceService())->changeBalance($order->user, $order->total_amount, BalanceLog::ACTION_ORDER_CANCELLED, '订单-取消', $order); + (new BalanceService())->changeBalance( + $order->user, + $order->total_amount, + $log->after_sale_id ? BalanceLog::ACTION_ORDER_AFTER_SALE : BalanceLog::ACTION_ORDER_CANCELLED, + $log->after_sale_id ? '订单-售后退款' : $log->reason, + $order + ); $log->update([ 'status' => OrderRefundLog::STATUS_SUCCESS, diff --git a/app/Models/BalanceLog.php b/app/Models/BalanceLog.php index ec586bd3..1bb91af1 100644 --- a/app/Models/BalanceLog.php +++ b/app/Models/BalanceLog.php @@ -7,7 +7,8 @@ use Illuminate\Database\Eloquent\Model; class BalanceLog extends Model { public const ACTION_ORDER_PAID = 1; - public const ACTION_ORDER_CANCELLED = 1; + public const ACTION_ORDER_CANCELLED = 2; + public const ACTION_ORDER_AFTER_SALE = 3; /** * @var array diff --git a/app/Models/WalletLog.php b/app/Models/WalletLog.php index 8a911e66..154502b2 100644 --- a/app/Models/WalletLog.php +++ b/app/Models/WalletLog.php @@ -7,7 +7,8 @@ use Illuminate\Database\Eloquent\Model; class WalletLog extends Model { public const ACTION_ORDER_PAID = 1; - public const ACTION_ORDER_CANCELLED = 1; + public const ACTION_ORDER_CANCELLED = 2; + public const ACTION_ORDER_AFTER_SALE = 3; /** * @var array