From f81989efc241d4a2b9ce0dc1f5ed53bf3aafdbe4 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 6 Jul 2024 17:48:42 +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=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php
index 08e05e13b..dd9f9d404 100644
--- a/app/store/lists/user/UserLists.php
+++ b/app/store/lists/user/UserLists.php
@@ -11,6 +11,7 @@ use app\common\model\user\User;
 use app\common\model\user_ship\UserShip;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\user\UserAddress;
+use app\common\model\user_sign_log\UserSignLog;
 use app\common\model\vip_flow\VipFlow;
 
 class UserLists extends BaseAdminDataLists  implements ListsSearchInterface
@@ -62,8 +63,8 @@ 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)->where('type','<>',3)->sum('number');
-                $number2  = UserSign::where('uid',$data['id'])->where('status',1)->where('type',3)->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');
                 if($number1<$number2){
                     $data['get_frozen']=0;
                 }else{