fix some bugs 3

app/Http/Controllers/Customer/OrderController.php

@@ -38,7 +38,10 @@ class OrderController extends Controller
 
         $lastPrice = (float) (Price::latest('created_at')->value('price') ?? 0);
 
-        $goldAmount = app(WalletBalanceService::class)->effectiveMainWalletGold((int) $customerId);
+        $goldAmount = app(WalletBalanceService::class)->effectiveMainWalletGold(
+            (int) $customerId,
+            (int) ($customer->type ?? 2)
+        );
 
         $orders = Order::query()
             ->where('customer_id', $customerId)

app/Http/Controllers/Customer/ProductController.php

@@ -59,7 +59,7 @@ class ProductController extends SuperController
             }
 
             if ($representativeId !== null) {
-                $mainWalletGold = $balanceService->effectiveMainWalletGold((int) $user->id);
+                $mainWalletGold = $balanceService->effectiveMainWalletGold((int) $user->id, (int) $user->type);
             }
 
             $products = $products->filter(function ($product) use ($mainWalletProductIds, $representativeId) {

app/Http/Controllers/Pargar/PargarInboundController.php

@@ -271,17 +271,15 @@ class PargarInboundController extends Controller
         $goldInv = isset($data['GoldInv']) ? (float) str_replace('/', '.', (string) $data['GoldInv']) : 0;
         $rialInv = isset($data['RialInv']) ? (float) str_replace('/', '.', (string) $data['RialInv']) : 0;
 
-        $wallet = $customer->wallet->where('fund_id', null)->first();
+        // خواندن و نوشتن روی همان کیف اصلی مشتری — نه first() تصادفی
-        if ($wallet) {
+        $ownerType = (int) ($customer->type ?? 2);
-            $goldDiff = $goldInv - (float) $wallet->gold;
+        $walletInterface = new WalletInterface($customer->id, $ownerType);
-            $rialDiff = $rialInv - (float) $wallet->cash;
+        $wallet = $walletInterface->wallet;
-        } else {
+
-            $goldDiff = $goldInv;
+        $goldDiff = $goldInv - (float) ($wallet->gold ?? 0);
-            $rialDiff = $rialInv;
+        $rialDiff = $rialInv - (float) ($wallet->cash ?? 0);
-        }
 
         if (abs($goldDiff) >= 0.01 || abs($rialDiff) >= 1) {
-            $walletInterface = new WalletInterface($customer->id, 2);
             new TransactionInterface($walletInterface, [
                 'cash' => $rialDiff,
                 'gold' => $goldDiff,

app/Services/AssetSummaryService.php

@@ -59,7 +59,8 @@ class AssetSummaryService
                 $metalsWithProductWallet,
                 $mainWalletProductIds,
                 $userWallets,
-                $customerId
+                $customerId,
+                $ownerType
             ),
             $this->buildInventoryCards($userWallets, $catalogById, $mainWalletProductIds, $mainWallet),
         );
@@ -71,7 +72,8 @@ class AssetSummaryService
             $catalogById,
             $metalsWithProductWallet,
             $mainWalletProductIds,
-            $customerId
+            $customerId,
+            $ownerType
         );
         $cashWallet = $this->walletBalanceService->mainWalletCash($userWallets);
         $assetsRialValue = $this->sumAssetsRialValue(
@@ -218,12 +220,13 @@ class AssetSummaryService
         array $metalsWithProductWallet = [],
         array $mainWalletProductIds = [],
         Collection $userWallets,
-        int $customerId = 0
+        int $customerId = 0,
+        int $ownerType = 0
     ): array {
         $cards = [];
         $mainWalletGrams = Controller::weightToGrams(
             $customerId > 0
-                ? $this->walletBalanceService->effectiveMainWalletGold($customerId)
+                ? $this->walletBalanceService->effectiveMainWalletGold($customerId, $ownerType)
                 : $this->effectiveMainWalletGold($userWallets, $mainWallet, $mainWalletProductIds)
         );
         $assignedMetalIds = [];
@@ -237,9 +240,10 @@ class AssetSummaryService
             }
 
             $mainWalletWeight = $customerId > 0
-                ? $this->walletBalanceService->effectiveMainWalletGold($customerId)
+                ? $this->walletBalanceService->effectiveMainWalletGold($customerId, $ownerType)
                 : $this->effectiveMainWalletGold($userWallets, $mainWallet, $mainWalletProductIds);
-            if ($mainWalletWeight <= 0) {
+            // صفر کامل را نشان نده؛ منفی را نشان بده تا اختلاف موجودی دیده شود
+            if (abs($mainWalletWeight) < 0.000001) {
                 return [];
             }
 
@@ -322,7 +326,7 @@ class AssetSummaryService
     public function productDisplayQuantity(int $customerId, int $ownerType, int $productId): float
     {
         if ($this->configService->isMainWalletProduct($productId)) {
-            return $this->walletBalanceService->effectiveMainWalletGold($customerId);
+            return $this->walletBalanceService->effectiveMainWalletGold($customerId, $ownerType);
         }
 
         $card = $this->productInventoryCard($customerId, $ownerType, $productId);
@@ -609,7 +613,8 @@ class AssetSummaryService
         Collection $catalogById,
         array $metalsWithProductWallet = [],
         array $mainWalletProductIds = [],
-        int $customerId = 0
+        int $customerId = 0,
+        int $ownerType = 0
     ): array {
         if ($metalIds === []) {
             return [];
@@ -617,7 +622,7 @@ class AssetSummaryService
 
         $mainWalletGrams = Controller::weightToGrams(
             $customerId > 0
-                ? $this->walletBalanceService->effectiveMainWalletGold($customerId)
+                ? $this->walletBalanceService->effectiveMainWalletGold($customerId, $ownerType)
                 : $this->effectiveMainWalletGold($userWallets, $mainWallet, $mainWalletProductIds)
         );
         $totals = [];

app/Services/WalletBalanceService.php

@@ -46,26 +46,33 @@ class WalletBalanceService
     /**
      * موجودی مؤثر کیف اصلی برای نمایش آبشده =
      * gold کیف اصلی + gold کیف‌های legacy محصولات main_wallet_products.
-     * owner_type در جمع نادیده گرفته می‌شود تا خریدهای قدیمی از دست نروند.
+     *
+     * @param  int|null  $ownerType  اگر داده شود فقط همان owner_type جمع می‌شود (هم‌تراز wallet/me).
      */
-    public function effectiveMainWalletGold(int $ownerId): float
+    public function effectiveMainWalletGold(int $ownerId, ?int $ownerType = null): float
     {
-        $mainGold = (float) Wallet::query()
+        $mainQuery = Wallet::query()
             ->where('owner', $ownerId)
             ->whereNull('fund_id')
-            ->whereNull('product_id')
+            ->whereNull('product_id');
-            ->sum('gold');
+        if ($ownerType !== null) {
+            $mainQuery->where('owner_type', $ownerType);
+        }
+        $mainGold = (float) $mainQuery->sum('gold');
 
         $productIds = $this->mainWalletProductIds();
         if ($productIds === []) {
             return round($mainGold, 3);
         }
 
-        $orphanedGold = (float) Wallet::query()
+        $orphanedQuery = Wallet::query()
             ->where('owner', $ownerId)
             ->whereNull('fund_id')
-            ->whereIn('product_id', $productIds)
+            ->whereIn('product_id', $productIds);
-            ->sum('gold');
+        if ($ownerType !== null) {
+            $orphanedQuery->where('owner_type', $ownerType);
+        }
+        $orphanedGold = (float) $orphanedQuery->sum('gold');
 
         return round($mainGold + $orphanedGold, 3);
     }