From a717662cb9e2e6e9f9121468cb4d0a0ce65f8eb0 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Tue, 2 Jul 2024 11:51:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=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/api/logic/user/UserLogic.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php
index 6a5d2b628..5376a200b 100644
--- a/app/api/logic/user/UserLogic.php
+++ b/app/api/logic/user/UserLogic.php
@@ -89,6 +89,7 @@ class UserLogic extends BaseLogic
             ->find();
         //判断是不是员工
         if($data){
+            $GetNumber = $data['integral'];
             $data = $data->toArray();
             $all =UserShip::field('id,title,limit')->select()->toArray();
             $new =  self::getNextArrayByID($all,$data['user_ship']);
@@ -117,11 +118,11 @@ class UserLogic extends BaseLogic
                 'is_writeoff'=>0,'uid'=>$uid
             ])->whereIn('shipping_type',[1,2])->count();
             $data['openid'] = UserAuth::where(['user_id'=>$uid,'terminal'=>1])->value('openid');
-            $number=UserSign::where('uid',$uid)->where('status',0)->sum('number');
-            $data['integral']=bcadd($data['integral'],$number,2);
+//            $number=UserSign::where('uid',$uid)->where('status',0)->sum('number');
+//            $data['integral']=bcadd($data['integral'],$number,2);
 
-            $number = UserSign::where('uid',$uid)->where(['status'=>0,'financial_pm'=>1])->sum('number');
-            $GetNumber = UserSign::where('uid',$uid)->where('status',1)->sum('number');
+            $number = UserSign::where('uid',$uid)->where(['type'=>0,'status'=>1])->sum('number');
+//            $GetNumber = UserSign::where('uid',$uid)->where('status',1)->sum('number');
             $data['number'] =bcadd($number,0,2);
             $data['GetNumber'] =bcadd($GetNumber,0,2);
         }else{