|
|
@@ -1125,14 +1125,13 @@ class BetService extends BaseService
|
|
|
$betNoticeMax = $betNoticeNum[1] ?? 38;
|
|
|
$noticeNum = rand($betNoticeMini, $betNoticeMax);
|
|
|
// shuffle($openList);
|
|
|
- Log::error('lotteryNotice openList', $openList);
|
|
|
+ // Log::error('lotteryNotice openList', $openList);
|
|
|
|
|
|
|
|
|
$text = "{$issue_no}期开奖结果";
|
|
|
$text .= "\n-----本期开奖账单----- \n";
|
|
|
foreach ($openList as $k => $v) {
|
|
|
- // $language = User::where('member_id', $v['member_id'])->first()->language;
|
|
|
- // App::setLocale($language);
|
|
|
+
|
|
|
|
|
|
$amount = number_format($v['amount'], 2);
|
|
|
$v['win_amount'] = number_format($v['win_amount'], 2);
|
|
|
@@ -1156,23 +1155,25 @@ class BetService extends BaseService
|
|
|
$text .= "-------------------------------- \n";
|
|
|
}
|
|
|
|
|
|
- // if ($v['is_send']) {
|
|
|
- // $text2 = lang("{issue_no}期开奖结果");
|
|
|
- // $text2 = str_replace("{issue_no}", $issue_no, $text2);
|
|
|
- // $text2 .= "\n";
|
|
|
- // $text2 .= lang('下注类型') . ":[" . implode(',', $v['keywords']) . "] \n";
|
|
|
- // $text2 .= lang('中奖类型') . ":[" . $openKeyword . "] \n";
|
|
|
- // $text2 .= lang('投注金额') . ":{$amount} \n";
|
|
|
- // $text2 .= lang('中奖金额') . ":{$v['win_amount']} \n";
|
|
|
- // $text2 .= lang('派彩金额') . ":{$profit} \n";
|
|
|
- // $text2 .= lang("盈亏金额") . ":{$yl} \n";
|
|
|
- // $keyboard = [];
|
|
|
- // $keyboard[] = [
|
|
|
- // ['text' => lang("开奖历史"), 'callback_data' => "showLotteryHistory@@" . $issue_no]
|
|
|
- // ];
|
|
|
- // // self::sendMessage($v['member_id'],$text2,$keyboard);
|
|
|
- // SendTelegramMessageJob::dispatch($v['member_id'], $text2, $keyboard);
|
|
|
- // }
|
|
|
+ if ($v['is_send']) {
|
|
|
+ $language = User::where('member_id', $v['member_id'])->first()->language;
|
|
|
+ App::setLocale($language);
|
|
|
+ $text2 = lang("{issue_no}期开奖结果");
|
|
|
+ $text2 = str_replace("{issue_no}", $issue_no, $text2);
|
|
|
+ $text2 .= "\n";
|
|
|
+ $text2 .= lang('下注类型') . ":[" . implode(',', $v['keywords']) . "] \n";
|
|
|
+ $text2 .= lang('中奖类型') . ":[" . $openKeyword . "] \n";
|
|
|
+ $text2 .= lang('投注金额') . ":{$amount} \n";
|
|
|
+ $text2 .= lang('中奖金额') . ":{$v['win_amount']} \n";
|
|
|
+ $text2 .= lang('派彩金额') . ":{$profit} \n";
|
|
|
+ $text2 .= lang("盈亏金额") . ":{$yl} \n";
|
|
|
+ $keyboard = [];
|
|
|
+ $keyboard[] = [
|
|
|
+ ['text' => lang("开奖历史"), 'callback_data' => "showLotteryHistory@@" . $issue_no]
|
|
|
+ ];
|
|
|
+ // self::sendMessage($v['member_id'],$text2,$keyboard);
|
|
|
+ SendTelegramMessageJob::dispatch($v['member_id'], $text2, $keyboard);
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -1182,7 +1183,7 @@ class BetService extends BaseService
|
|
|
// 群通知
|
|
|
// self::bettingGroupNotice($text, $inlineButton, '');
|
|
|
|
|
|
- Log::error('lotteryNotice Group:'.$text);
|
|
|
+ // Log::error('lotteryNotice Group:'.$text);
|
|
|
SendTelegramGroupMessageJob::dispatch($text, $inlineButton, '');
|
|
|
|
|
|
|