From ef513bba6e9d37d1fb78ad252f175aba55b7b03c Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 8 Oct 2023 16:09:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/user/UserBill.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controller/admin/user/UserBill.php b/app/controller/admin/user/UserBill.php
index 57a341a4..5f672d1d 100644
--- a/app/controller/admin/user/UserBill.php
+++ b/app/controller/admin/user/UserBill.php
@@ -53,17 +53,20 @@ class UserBill extends BaseController
     }
 
     public function deposit(){
-        $where = $this->request->params(['keyword', 'date']);
+        $where = $this->request->params(['keyword', 'date','mer_id']);
         [$page, $limit] = $this->getPage();
         $query= Db::name('margin_order')->where('paid',1);
         if(isset($where['date'])&& $where['date']!=''){
             $a=explode(' ',$where['date']);
            $query->whereTime('birthday', 'between', [$a[0],$a[1]]);
         }
-        if(isset($where['keyword'])&& $where['date']!=''){
+        if(isset($where['keyword'])&& $where['keyword']!=''){
             $a=Db::name('merchant')->whereLike('mer_name',$where['mer_name'])->column('mer_id');
            $query->where('mer_id', 'in', [$a[0],$a[1]]);
         }
+        if(isset($where['mer_id'])&& $where['mer_id']!=''){
+           $query->where('mer_id', $where['mer_id']);
+        }
         $count=$query->count();
 
         $list=$query->withAttr('mer_name',function($value,$data){