修改：经销商平级奖修改为区县奖励、月月返修改为合作养殖补助、分红奖修改为拓新奖

plugins/rebate/src/api/IndexController.php

@@ -280,11 +280,44 @@ class IndexController extends ApiController{
             // 总收益
             case 'all_income':
                 $result = Income::uniacid()
-                    ->select(['id','member_id','dividend_code','amount','status','created_at','type_name'])
-                    ->where('member_id', $uid)
-                    ->orderBy('created_at','DESC')
+                    ->leftJoin('yz_team_dividend', 'yz_team_dividend.id', 'yz_member_income.incometable_id')
+                    ->select([
+                        'yz_member_income.id',
+                        'yz_member_income.member_id',
+                        'yz_member_income.dividend_code',
+                        'yz_member_income.amount',
+                        'yz_member_income.status',
+                        'yz_member_income.created_at',
+                        'yz_member_income.type_name',
+                        'yz_team_dividend.type'
+                    ])
+                    ->where('yz_member_income.member_id', $uid)
+                    ->orderBy('yz_member_income.created_at','DESC')
                     ->paginate(20)
                     ->toArray();
+                foreach($result['data'] as &$item){
+                    switch ($item['type']) {
+                        case 0:
+                            $item['type_name'] = '分红佣金';
+                            break;
+                        case 1:
+                            $item['type_name'] = '区县奖励';
+                            break;
+                        case 2:
+                            $item['type_name'] = '感恩奖励';
+                            break;
+                        case 3:
+                            $item['type_name'] = '额外分红';
+                            break;
+                        case 7:
+                            $item['type_name'] = '合作养殖补助';// 月月返
+                            break;
+                        case 8:
+                            $item['type_name'] = '拓新奖';// 分红奖
+                            break;
+                    }
+                }
+
                 break;
             // 今日收益
             case 'today':

plugins/team-dividend/src/models/TeamDividendModel.php

@@ -192,7 +192,7 @@ class TeamDividendModel extends BaseModel
                     $this->TypeService = '分红佣金';
                     break;
                 case 1:
-                    $this->TypeService = '平级奖励';
+                    $this->TypeService = '区县奖励';//平级奖励
                     break;
                 case 2:
                     $this->TypeService = '感恩奖励';
@@ -201,10 +201,10 @@ class TeamDividendModel extends BaseModel
                     $this->TypeService = '额外分红';
                     break;
                 case 7:
-                    $this->TypeService = '月月返';
+                    $this->TypeService = '合作养殖补助';// 月月返
                     break;
                 case 8:
-                    $this->TypeService = '分红奖';
+                    $this->TypeService = '拓新奖';// 分红奖
                     break;
             }
         }