From f2cc9f7f9fdc8d7c4cdad105aeaf0a6c19cb437a Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 6 Jul 2024 17:48:51 +0800
Subject: [PATCH] =?UTF-8?q?feat(UserLists.php):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/store/lists/user/UserLists.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php
index dd9f9d404..43fcf955d 100644
--- a/app/store/lists/user/UserLists.php
+++ b/app/store/lists/user/UserLists.php
@@ -63,12 +63,12 @@ class UserLists extends BaseAdminDataLists  implements ListsSearchInterface
                 where(['user_id'=>$data['id'],'status'=>0])
                     ->sum('number')??0;
                 $data['amount_frozen']  = UserSign::where('uid',$data['id'])->where('status',0)->sum('number');
-                $number1 = UserSign::where('uid',$data['id'])->where('status',1)->sum('number');
-                $number2  = UserSignLog::where('uid',$data['id'])->where(['status'=>1,'order_type'=>0])->sum('number');
+                $number1 = UserSignLog::where('uid',$data['id'])->where(['status'=>1,'order_type'=>0,'financial_pm'=>1])->sum('number');
+                $number2  = UserSignLog::where('uid',$data['id'])->where(['status'=>1,'order_type'=>0,'financial_pm'=>0])->sum('number');
                 if($number1<$number2){
                     $data['get_frozen']=0;
                 }else{
-                    $data['get_frozen']=bcsub($number1,$number2,2)??0;
+                    $data['get_frozen']=bcsub($number2,$number1,2)??0;
                 }
 
 	        })->toArray();