shuizhi
/
admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复：合作养殖补助 全部金额统计错误，未结算金额不显示

This commit is contained in:
wuhui_zzw 2024-04-24 11:52:37 +08:00
parent 28f778fef4
commit a013f3c2e0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/rebate/src/api/IndexController.php
View File

@ -220,7 +220,7 @@ class IndexController extends ApiController{
$uid = \YunShop::app()->getMemberId(); $uid = \YunShop::app()->getMemberId();
// 获取统计信息 // 获取统计信息
$data = [ $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'),// 待入账收益 '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'),// 已入账收益 '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) $list = TeamDividendModel::where('member_id', $uid)
->select(['id','expect_thaw_time','dividend_amount','status','type']) ->select(['id','expect_thaw_time','dividend_amount','status','type'])
->where('agent_level',$levelId) ->where('agent_level',$levelId)
->where('status',1)
->orderBy('expect_thaw_time','ASC') ->orderBy('expect_thaw_time','ASC')
->get()->each(function($item){ ->get()->each(function($item){
$item['expect_thaw_time'] = date("m月d日",$item['expect_thaw_time']); $item['expect_thaw_time'] = date("m月d日",$item['expect_thaw_time']);
@ -257,7 +258,7 @@ class IndexController extends ApiController{
return $item; return $item;
})->toArray(); })->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'); $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(); $levelInfo = TeamDividendLevelModel::select(['id','level_name'])->where('id',$levelId)->first();