|
|
@@ -160,16 +160,28 @@ class SecretService
|
|
|
['text' => '确认', 'callback_data' => 'secret@@confirm'],
|
|
|
]
|
|
|
];
|
|
|
- $wallet->available_balance = floatval($wallet->available_balance);
|
|
|
- $wallet->available_balance = bcadd($wallet->available_balance,0,2);
|
|
|
+ $wallet->available_balance = bcadd($wallet->available_balance, 0, 2);
|
|
|
+ $available_balance = $wallet->available_balance;
|
|
|
$text = "原账号信息：\n";
|
|
|
$text .= "用户ID：{$user->getMemberId()}\n";
|
|
|
$text .= "用户名：{$user->getUsername()}\n";
|
|
|
$text .= "昵称：{$user->getFirstName()}\n";
|
|
|
$text .= "余额：{$wallet->available_balance} RMB\n";
|
|
|
-
|
|
|
$text .= "\n-------------------------------\n\n";
|
|
|
- $text .= "注意：请确认原账号信息，点击确认后，原账号将注销，原账号的余额以及其他信息将同步到新账号中！此操作不可撤销";
|
|
|
+ $user = User::where('member_id', $chatId)->first();
|
|
|
+ $wallet = Wallet::where('member_id', $user->getMemberId())->first();
|
|
|
+ $wallet->available_balance = bcadd($wallet->available_balance, 0, 2);
|
|
|
+ $text .= "新账号信息：\n";
|
|
|
+ $text .= "用户ID：{$user->getMemberId()}\n";
|
|
|
+ $text .= "用户名：{$user->getUsername()}\n";
|
|
|
+ $text .= "昵称：{$user->getFirstName()}\n";
|
|
|
+ $text .= "余额：{$wallet->available_balance} RMB\n\n";
|
|
|
+ $available_balance = bcadd($available_balance, $wallet->available_balance, 2);
|
|
|
+ $text .= "-------------------------------\n\n";
|
|
|
+ $text .= "合并后余额：{$available_balance} RMB";
|
|
|
+
|
|
|
+
|
|
|
+ $text .= "注意：请确认原账号信息，点击确认后，原账号将注销，原账号的余额以及其他信息将合并到新账号中！此操作不可撤销。\n请确认操作";
|
|
|
|
|
|
Cache::put("{$chatId}_OLD_SECRET", $secret);
|
|
|
return [
|
Ken