gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-22 19:44:02 +08:00
Code Issues Releases Wiki Activity

去除退款延迟

Browse Source
This commit is contained in:
koogua 2021-02-15 21:10:34 +08:00
parent 122b4adfa8
commit bb38d90d53
3 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Console/Tasks/RefundTask.php
View File

@ -53,13 +53,6 @@ class RefundTask extends Task
continue; continue;
} }
/**
* 退款存在延迟，给取消退款调解机会
*/
if (isset($itemInfo['deadline']) && $itemInfo['deadline'] > time()) {
continue;
}
try { try {
$this->db->begin(); $this->db->begin();

10
app/Http/Admin/Services/Refund.php
View File

@ -103,9 +103,17 @@ class Refund extends Service
$task = new TaskModel(); $task = new TaskModel();
$itemInfo = [
'refund' => [
'id' => $refund->id,
'order_id' => $refund->order_id,
'trade_id' => $refund->trade_id,
],
];
$task->item_id = $refund->id; $task->item_id = $refund->id;
$task->item_type = TaskModel::TYPE_REFUND; $task->item_type = TaskModel::TYPE_REFUND;
$task->item_info = ['refund' => $refund->toArray()]; $task->item_info = $itemInfo;
$task->priority = TaskModel::PRIORITY_HIGH; $task->priority = TaskModel::PRIORITY_HIGH;
$task->status = TaskModel::STATUS_PENDING; $task->status = TaskModel::STATUS_PENDING;

80
app/Services/Logic/Refund/RefundCreate.php
View File

@ -3,7 +3,6 @@
namespace App\Services\Logic\Refund; namespace App\Services\Logic\Refund;
use App\Models\Refund as RefundModel; use App\Models\Refund as RefundModel;
use App\Models\Task;
use App\Models\Task as TaskModel; use App\Models\Task as TaskModel;
use App\Repos\Order as OrderRepo; use App\Repos\Order as OrderRepo;
use App\Services\Logic\OrderTrait; use App\Services\Logic\OrderTrait;
@ -19,6 +18,8 @@ class RefundCreate extends Service
public function handle() public function handle()
{ {
$logger = $this->getLogger('refund');
$post = $this->request->getPost(); $post = $this->request->getPost();
$order = $this->checkOrderBySn($post['order_sn']); $order = $this->checkOrderBySn($post['order_sn']);
@ -47,42 +48,61 @@ class RefundCreate extends Service
$validator->checkAmount($order->amount, $refundAmount); $validator->checkAmount($order->amount, $refundAmount);
$refund = new RefundModel(); try {
$refund->subject = $order->subject; $this->db->begin();
$refund->amount = $refundAmount;
$refund->apply_note = $applyNote;
$refund->order_id = $order->id;
$refund->trade_id = $trade->id;
$refund->owner_id = $user->id;
$refund->status = RefundModel::STATUS_APPROVED;
$refund->review_note = '退款周期内无条件审批';
$refund->create(); $refund = new RefundModel();
$task = new TaskModel(); $refund->subject = $order->subject;
$refund->amount = $refundAmount;
$refund->apply_note = $applyNote;
$refund->order_id = $order->id;
$refund->trade_id = $trade->id;
$refund->owner_id = $user->id;
$refund->status = RefundModel::STATUS_APPROVED;
$refund->review_note = '退款周期内无条件审批';
/** if ($refund->create() === false) {
* 设定延迟，给取消退款一个调解机会 throw new \RuntimeException('Create Refund Failed');
*/ }
$itemInfo = [
'refund' => [
'id' => $refund->id,
'order_id' => $refund->order_id,
'trade_id' => $refund->trade_id,
],
'deadline' => time() + 3600 * 24 * 2,
];
$task->item_id = $refund->id; $task = new TaskModel();
$task->item_type = TaskModel::TYPE_REFUND;
$task->item_info = $itemInfo;
$task->priority = TaskModel::PRIORITY_MIDDLE;
$task->status = TaskModel::STATUS_PENDING;
$task->create(); $itemInfo = [
'refund' => [
'id' => $refund->id,
'order_id' => $refund->order_id,
'trade_id' => $refund->trade_id,
],
];
return $refund; $task->item_id = $refund->id;
$task->item_type = TaskModel::TYPE_REFUND;
$task->item_info = $itemInfo;
$task->priority = TaskModel::PRIORITY_MIDDLE;
$task->status = TaskModel::STATUS_PENDING;
if ($task->create() === false) {
throw new \RuntimeException('Create Refund Task Failed');
}
$this->db->commit();
return $refund;
} catch (\Exception $e) {
$this->db->rollback();
$logger->error('Create Refund Exception ' . kg_json_encode([
'file' => $e->getFile(),
'line' => $e->getLine(),
'message' => $e->getMessage(),
]));
throw new \RuntimeException('sys.trans_rollback');
}
} }
} }