From ef60ca85cfff474aa571b105a51dffc344582fc1 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Thu, 28 Nov 2019 16:35:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Base/Service/PromoteService.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php
index b42047a94..a8d5e1e7c 100644
--- a/Application/Base/Service/PromoteService.class.php
+++ b/Application/Base/Service/PromoteService.class.php
@@ -94,6 +94,7 @@ class PromoteService {
         $shiftIds = isset($params['shift_ids']) && $params['shift_ids'] ? $params['shift_ids'] : [];
         $creatorId = isset($params['creator_id']) ? $params['creator_id'] : 0;
         $creatorType = isset($params['creator_type']) ? $params['creator_type'] : 0;
+        $remark = isset($params['remark']) ? $params['remark'] : '';
 
         if ($fromPromoteId == $toPromoteId) {
             return [
@@ -145,6 +146,7 @@ class PromoteService {
             'creator_type' => $creatorType,
             'status' => 0,
             'type' => $type,
+            'remark' => $remark,
             'shift_ids' => json_encode($shiftIds)
         ];
 
@@ -303,6 +305,7 @@ class PromoteService {
         $fromPromoteId = $task['from_promote_id'];
         $orderTime = $task['order_time'];
         $shiftIds = json_decode($task['shift_ids'], true) ?? [];
+        $remark = $task['remark'] ?? '';
 
         $creator = null;
         $opAccount = '';
@@ -343,7 +346,7 @@ class PromoteService {
                 'promote_account' => $fromPromote['account'],
                 'promote_id_to' => $toPromote['id'],
                 'promote_account_to' => $toPromote['account'],
-                'remark' => $task['creator_type'] == 0 ? '后台补链' : '玩家迁移',
+                'remark' => $remark == '' ? ($task['creator_type'] == 0 ? '后台补链' : '玩家迁移') : $remark,
                 'order_time' => $orderTime,
                 'create_time' => time(),
                 'op_id' => $creator ? $creator['id'] : 0,