diff --git a/plugins/rebate/src/api/IndexController.php b/plugins/rebate/src/api/IndexController.php index a66a88f5..3ca5d23a 100644 --- a/plugins/rebate/src/api/IndexController.php +++ b/plugins/rebate/src/api/IndexController.php @@ -220,7 +220,7 @@ class IndexController extends ApiController{ $uid = \YunShop::app()->getMemberId(); // 获取统计信息 $data = [ - 'all_income' => TeamDividendModel::uniacid()->where('member_id',$uid)->sum('dividend_amount'),// 全部收益 + 'all_income' => TeamDividendModel::uniacid()->where('member_id',$uid)->where('status', '<>', -1)->sum('dividend_amount'),// 全部收益 'credited' => TeamDividendModel::uniacid()->where('member_id',$uid)->where('status',2)->sum('dividend_amount'),// 待入账收益 'recorded' => TeamDividendModel::uniacid()->where('member_id',$uid)->whereIn('status',[0,1])->sum('dividend_amount'),// 已入账收益 // 可提现 @@ -250,6 +250,7 @@ class IndexController extends ApiController{ $list = TeamDividendModel::where('member_id', $uid) ->select(['id','expect_thaw_time','dividend_amount','status','type']) ->where('agent_level',$levelId) + ->where('status',1) ->orderBy('expect_thaw_time','ASC') ->get()->each(function($item){ $item['expect_thaw_time'] = date("m月d日",$item['expect_thaw_time']); @@ -257,7 +258,7 @@ class IndexController extends ApiController{ return $item; })->toArray(); // 统计 - $all_income = TeamDividendModel::where('member_id', $uid)->where('agent_level',$levelId)->sum('dividend_amount'); + $all_income = TeamDividendModel::where('member_id', $uid)->where('agent_level',$levelId)->where('status', '<>', -1)->sum('dividend_amount'); $credited = TeamDividendModel::where('member_id', $uid)->where('agent_level',$levelId)->where('status', 2)->sum('dividend_amount'); // 当前等级 $levelInfo = TeamDividendLevelModel::select(['id','level_name'])->where('id',$levelId)->first();