333

app/Http/Controllers/api/TelegramWebHook.php

@@ -394,7 +394,9 @@ class TelegramWebHook extends Controller
 
                     $returnMsg = $this->processChatMessage($chatId, $messageId, $message, $message['from']);
                     if ($returnMsg) {
-                        if (isset($returnMsg['photo']) && $returnMsg['photo'] != '') {
+                        if (isset($returnMsg['image']) && $returnMsg['image'] != '') {
+                            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);

app/Services/PaymentOrderService.php

@@ -216,7 +216,6 @@ class PaymentOrderService extends BaseService
 
             $qrCode = asset(self::createPaymentQrCode($ret['data']['payUrl']));
             $result['image'] = $qrCode;
-            // $result['photo'] =InputFile::create($qrCode);
             $item = $ret['data'];
             $data['status'] = self::STATUS_PROCESS;
             $data['pay_no'] = $item['tradeNo'];
@@ -229,8 +228,6 @@ class PaymentOrderService extends BaseService
             $text .= "请按实际支付金额进行付款，否则影响到账 \n";
             $text .= "支付完成后请耐心等待，支付到账会第一时间通知您！ \n";
             $result['text'] = $text;
-            self::sendMessage($result['chat_id'],$text,[],$qrCode);
-            return null;
         } else {
             $result['text'] = $ret['message'];
         }