解决商户分润数据不展示问题

app/common/repositories/finance/FinanceRepository.php

@@ -1943,7 +1943,7 @@ class FinanceRepository extends BaseRepository
         ->leftJoin('store_order o', 'o.order_id = uss.order_id AND uss.order_type = 0')
         // 条件关联 order_merchant 表 (只在 uss.order_type = 10 时尝试关联 om)
         ->leftJoin('rrx_order_merchant om', 'om.id = uss.order_id AND uss.order_type = 10') // 注意这里的表名和字段
-        ->leftJoin('merchant m', 'm.mer_id=u.mer_id')
+        ->leftJoin('merchant m', 'm.uid=u.uid')
         ->when(isset($mer_id) && $mer_id != '' && $mer_id != 0, function ($query) use ($mer_id) {
             $query->where(function ($query) use($mer_id) {
                 $query->where('o.mer_id', $mer_id)->whereOr('om.mer_id', $mer_id);