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{