From a013f3c2e08fb2560bd8c1da495976f2fa750e42 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 24 Apr 2024 11:52:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=90=88=E4=BD=9C?=
 =?UTF-8?q?=E5=85=BB=E6=AE=96=E8=A1=A5=E5=8A=A9=20=20=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=AA=E7=BB=93=E7=AE=97=E9=87=91=E9=A2=9D=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/rebate/src/api/IndexController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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();