创客统计调整

app/common/repositories/finance/FinanceRepository.php

@@ -171,7 +171,10 @@ class FinanceRepository extends BaseRepository
             $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[4] ?? 0), 'name' => '创客'];
         }
         $res['left'][] = $data;
-        $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim(intval($maker['4-2'] ?? 0) + intval($maker['4-1'] ?? 0) + intval($userByCodeCount['temp'] ?? 0)), 'name' => '创客'];
+        // $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim(intval($maker['4-2'] ?? 0) + intval($maker['4-1'] ?? 0) + intval($userByCodeCount['temp'] ?? 0)), 'name' => '创客'];
+
+        $maker = Db::query("SELECT count(uid) as count FROM `rrx_merchant` where {$where}");
+        $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '创客'];
 
         return $res;
     }
@@ -466,7 +469,7 @@ class FinanceRepository extends BaseRepository
         $query2 = clone $query;
         $query3 = clone $query;
         $data['list'] = $this->date_where($query, $where['date'], 'ub.create_time')
-            ->field('ub.bill_id,ub.title,ub.number,ub.take_time,ub.commission_type,u.uid,u.phone,u.nickname,u.user_group,ub.order_sn,ub.take_time,ub.status,ub.create_time')
+            ->field('ub.bill_id,ub.title,ub.number,ub.mark,ub.take_time,ub.commission_type,u.uid,u.phone,u.nickname,u.user_group,ub.order_sn,ub.take_time,ub.status,ub.create_time')
             ->order('ub.bill_id', 'desc')
             ->page($page, $limit)
             ->select()