|
|
@@ -265,6 +265,15 @@ class FinanceRepository extends BaseRepository
|
|
265
|
265
|
public function user_overview($mer_id = 0)
|
|
266
|
266
|
{
|
|
267
|
267
|
$where = "1=1 ";
|
|
|
268
|
+
|
|
|
269
|
+ // 需要过滤掉的用户
|
|
|
270
|
+ /** @var UserRepository $userRepository */
|
|
|
271
|
+ $userRepository = app()->make(UserRepository::class);
|
|
|
272
|
+ $invalidUidList = $userRepository->getInvalidUidList();
|
|
|
273
|
+ if (!empty($invalidUidList)) {
|
|
|
274
|
+ $invalidSqlStr = ' AND uid NOT IN (' . implode(',', $invalidUidList) . ')';
|
|
|
275
|
+ $where .= $invalidSqlStr;
|
|
|
276
|
+ }
|
|
268
|
277
|
if ($mer_id) {
|
|
269
|
278
|
$mer_uid = Db::name('merchant')->where('mer_id', $mer_id)->value('uid');
|
|
270
|
279
|
$userRepository = app()->make(UserRepository::class);
|