fix some handling 5
This commit is contained in:
@@ -15,7 +15,7 @@ use Illuminate\Support\Facades\Log;
|
||||
* اصول (طبق rule ساعت کاری):
|
||||
* • هیچ تنظیمی را بازنویسی نمی‌کند — فقط می‌خواند.
|
||||
* • فقط پیام‌رسان‌هایی که ادمین انتخاب کرده و توکن + مقصد دارند ارسال می‌شود.
|
||||
* • قیمت هر محصول از قیمت پایه ذخیره‌شده + کارمزد نمایش همان اپ ساخته می‌شود.
|
||||
* • قیمت تابلو همان buy/sell کش‌شدهٔ /api/price/last است (مثل صفحهٔ اصلی اپ).
|
||||
*/
|
||||
class PriceChannelBroadcastService
|
||||
{
|
||||
@@ -84,13 +84,19 @@ TXT;
|
||||
|
||||
$products = $this->eligibleProducts();
|
||||
$boardProduct = $this->resolveBoardProduct($products);
|
||||
if ($boardProduct === null || (int) ($boardProduct->price ?? 0) <= 0) {
|
||||
if ($boardProduct === null) {
|
||||
Log::debug('PriceChannel: محصول تابلو (آبشده) واجد شرایطی نیست');
|
||||
return;
|
||||
}
|
||||
|
||||
$trade = $this->resolveLiveTradePrices();
|
||||
if ($trade === null || $trade['buy'] <= 0) {
|
||||
Log::debug('PriceChannel: مظنه زنده تابلو در دسترس نیست');
|
||||
return;
|
||||
}
|
||||
|
||||
// شرط ۲: قیمت تابلو یا قالب پیام نسبت به آخرین ارسال واقعاً تغییر کرده باشد
|
||||
$signature = $this->broadcastSignature($boardProduct);
|
||||
$signature = $this->broadcastSignature();
|
||||
if ($signature === Cache::get(self::SIGNATURE_CACHE_KEY)) {
|
||||
return;
|
||||
}
|
||||
@@ -125,9 +131,9 @@ TXT;
|
||||
/**
|
||||
* امضای ارسال — قیمت تابلو + قالب پیام؛ تغییر هر کدام باید ارسال بعدی را مجاز کند.
|
||||
*/
|
||||
private function broadcastSignature(Product $boardProduct): string
|
||||
private function broadcastSignature(): string
|
||||
{
|
||||
$prices = $this->computeDisplayPrices($boardProduct);
|
||||
$prices = $this->computeDisplayPrices();
|
||||
|
||||
return md5(implode('|', [
|
||||
$prices['gram_buy'],
|
||||
@@ -161,7 +167,12 @@ TXT;
|
||||
try {
|
||||
$products = $this->eligibleProducts();
|
||||
$boardProduct = $this->resolveBoardProduct($products);
|
||||
if ($boardProduct === null || (int) ($boardProduct->price ?? 0) <= 0) {
|
||||
if ($boardProduct === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
$trade = $this->resolveLiveTradePrices();
|
||||
if ($trade === null || $trade['buy'] <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -175,7 +186,7 @@ TXT;
|
||||
$results[$messenger] = $this->dispatchToMessenger($messenger, $target['token'], $target['chat_ids'], $message);
|
||||
}
|
||||
|
||||
$signature = $this->broadcastSignature($boardProduct);
|
||||
$signature = $this->broadcastSignature();
|
||||
$this->markSent();
|
||||
Cache::put(self::SIGNATURE_CACHE_KEY, $signature, now()->addDay());
|
||||
|
||||
@@ -211,10 +222,8 @@ TXT;
|
||||
|
||||
if ($message !== '' && $targets !== []) {
|
||||
$this->markSent();
|
||||
$products = $this->eligibleProducts();
|
||||
$boardProduct = $this->resolveBoardProduct($products);
|
||||
if ($boardProduct !== null) {
|
||||
Cache::put(self::SIGNATURE_CACHE_KEY, $this->broadcastSignature($boardProduct), now()->addDay());
|
||||
if ($this->resolveLiveTradePrices() !== null) {
|
||||
Cache::put(self::SIGNATURE_CACHE_KEY, $this->broadcastSignature(), now()->addDay());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -249,6 +258,8 @@ TXT;
|
||||
|
||||
$message = $this->buildMessage();
|
||||
$fromConfig = trim((string) $this->config->getString('price_channel_message_text', ''));
|
||||
$trade = $this->resolveLiveTradePrices();
|
||||
$display = $trade !== null ? $this->computeDisplayPrices() : null;
|
||||
|
||||
return [
|
||||
'enabled' => $this->config->getBool('price_channel_enabled', false),
|
||||
@@ -259,6 +270,10 @@ TXT;
|
||||
'messengers' => $messengers,
|
||||
'active_targets' => array_keys($this->resolveActiveTargets()),
|
||||
'template_source' => $fromConfig !== '' ? 'db' : 'default',
|
||||
'live_trade_buy_rial' => $trade['buy'] ?? 0,
|
||||
'live_trade_sell_rial' => $trade['sell'] ?? 0,
|
||||
'channel_gram_sell' => $display['gram_sell'] ?? '',
|
||||
'channel_gram_buy' => $display['gram_buy'] ?? '',
|
||||
'message_preview' => $message,
|
||||
];
|
||||
}
|
||||
@@ -323,7 +338,12 @@ TXT;
|
||||
{
|
||||
$products = $products ?? $this->eligibleProducts();
|
||||
$boardProduct = $boardProduct ?? $this->resolveBoardProduct($products);
|
||||
if ($boardProduct === null || (int) ($boardProduct->price ?? 0) <= 0) {
|
||||
if ($boardProduct === null) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$trade = $this->resolveLiveTradePrices();
|
||||
if ($trade === null || $trade['buy'] <= 0) {
|
||||
return '';
|
||||
}
|
||||
|
||||
@@ -349,7 +369,7 @@ TXT;
|
||||
{
|
||||
$name = trim((string) $this->config->getString('name_fa', ''));
|
||||
$title = $name !== '' ? "📊 قیمت لحظه‌ای {$name}" : '📊 قیمت لحظه‌ای';
|
||||
$prices = $this->computeDisplayPrices($boardProduct);
|
||||
$prices = $this->computeDisplayPrices();
|
||||
|
||||
$message = $this->applyTemplatePlaceholders($template, [
|
||||
'مثقال_فروش' => $prices['mesghal_sell'],
|
||||
@@ -416,21 +436,78 @@ TXT;
|
||||
}
|
||||
|
||||
/**
|
||||
* قیمت‌های نمایشی تابلو (گرم + مثقال) — همان منطق اپ + price_channel_diff.
|
||||
* همان buy/sell اپ — کش live_price_api_payload پرشده از /api/price/last.
|
||||
*
|
||||
* @return array{buy: int, sell: int}|null
|
||||
*/
|
||||
private function resolveLiveTradePrices(): ?array
|
||||
{
|
||||
$display = app(ProductDisplayPriceService::class);
|
||||
$display->warmLivePriceCache();
|
||||
|
||||
$cached = Cache::get(ProductDisplayPriceService::LIVE_PRICE_CACHE_KEY);
|
||||
if (is_array($cached)) {
|
||||
$buy = (int) ($cached['buy'] ?? 0);
|
||||
$sell = (int) ($cached['sell'] ?? 0);
|
||||
if ($buy <= 0) {
|
||||
$buy = (int) ($cached['price_last'] ?? 0);
|
||||
}
|
||||
if ($buy > 0 && $sell > 0) {
|
||||
return ['buy' => $buy, 'sell' => $sell];
|
||||
}
|
||||
}
|
||||
|
||||
$base = $display->resolveAppBasePrice();
|
||||
if ($base <= 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$provider = $this->config->priceProvider();
|
||||
$priceSource = in_array($provider, ['montzar', 'zaarbox', 'main_product'], true) ? $provider : null;
|
||||
$flags = $provider === 'montzar' ? $this->config->montzarOpenFlags() : [];
|
||||
|
||||
$trade = $this->config->buildTradeDisplayPrices(
|
||||
(float) $base,
|
||||
$priceSource,
|
||||
[
|
||||
'montzar_open_buy' => $flags['open_buy'] ?? true,
|
||||
'montzar_open_sell' => $flags['open_sell'] ?? true,
|
||||
]
|
||||
);
|
||||
|
||||
if ($trade['buy'] <= 0 && $trade['sell'] <= 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return [
|
||||
'buy' => (int) $trade['buy'],
|
||||
'sell' => (int) $trade['sell'],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* قیمت‌های نمایشی تابلو — همان منبع صفحهٔ اصلی اپ + price_channel_diff.
|
||||
*
|
||||
* @return array{gram_buy: string, gram_sell: string, mesghal_buy: string, mesghal_sell: string}
|
||||
*/
|
||||
private function computeDisplayPrices(Product $product): array
|
||||
private function computeDisplayPrices(): array
|
||||
{
|
||||
$channelDiff = (float) $this->config->getInt('price_channel_diff', 0);
|
||||
$diffBuy = (float) $this->config->displayBuyPriceDiffRial();
|
||||
$diffSell = (float) $this->config->displaySellPriceDiffRial();
|
||||
$mesghal = $this->changeMesghal();
|
||||
$base = (float) ($product->price ?? 0);
|
||||
$trade = $this->resolveLiveTradePrices();
|
||||
|
||||
// 🔴 خرید (مشتری می‌فروشد، پایین‌تر) — 🟢 فروش (مشتری می‌خرد، بالاتر)
|
||||
$gramBuy = $base - $diffSell - $channelDiff;
|
||||
$gramSell = $base + $diffBuy + $channelDiff;
|
||||
if ($trade === null) {
|
||||
return [
|
||||
'gram_buy' => '',
|
||||
'gram_sell' => '',
|
||||
'mesghal_buy' => '',
|
||||
'mesghal_sell' => '',
|
||||
];
|
||||
}
|
||||
|
||||
// sell در API = خرید مشتری (پایین) — buy در API = فروش مشتری (بالا) — مثل CurrentPrice.vue
|
||||
$gramBuy = (float) $trade['sell'] - $channelDiff;
|
||||
$gramSell = (float) $trade['buy'] + $channelDiff;
|
||||
|
||||
return [
|
||||
'gram_buy' => $this->formatPrice($gramBuy),
|
||||
|
||||
Reference in New Issue
Block a user