|
|
@@ -398,8 +398,8 @@ class TelegramWebHook extends Controller
|
|
|
$returnMsg = $this->processChatMessage($chatId, $messageId, $message, $message['from']);
|
|
|
if ($returnMsg) {
|
|
|
if (isset($returnMsg['image']) && $returnMsg['image'] != '') {
|
|
|
- KeyboardService::sendMessage($returnMsg['chat_id'],$returnMsg['text']??'',$returnMsg['keyboard']??[],$returnMsg['image']??'');
|
|
|
- }else if (isset($returnMsg['photo']) && $returnMsg['photo'] != '') {
|
|
|
+ KeyboardService::sendMessage($returnMsg['chat_id'], $returnMsg['text'] ?? '', $returnMsg['keyboard'] ?? [], $returnMsg['image'] ?? '');
|
|
|
+ } else if (isset($returnMsg['photo']) && $returnMsg['photo'] != '') {
|
|
|
$this->telegram->sendPhoto($returnMsg);
|
|
|
} else {
|
|
|
$this->telegram->sendMessage($returnMsg);
|
|
|
@@ -627,9 +627,12 @@ class TelegramWebHook extends Controller
|
|
|
$stepStatus = Cache::get(get_step_key($chatId), -1);
|
|
|
$stepStatus = intval($stepStatus);
|
|
|
$res = QianBaoWithdrawService::onMessage($chatId, $text, $messageId, $stepStatus);
|
|
|
- if(empty($res)){
|
|
|
+ if (empty($res)) {
|
|
|
$res = SanJinRechargeService::onMessage($chatId, $text, $messageId, $stepStatus);
|
|
|
}
|
|
|
+ if (empty($res)) {
|
|
|
+ $res = SecretService::onMessage($chatId, $text, $messageId, $stepStatus);
|
|
|
+ }
|
|
|
if (!empty($res)) return $res;
|
|
|
switch ($stepStatus) {
|
|
|
case StepStatus::INPUT_TOP_UP_MONEY:
|