diff --git a/app/backend/modules/withdraw/controllers/DetailController.php b/app/backend/modules/withdraw/controllers/DetailController.php index 16200355..aa94b5f2 100644 --- a/app/backend/modules/withdraw/controllers/DetailController.php +++ b/app/backend/modules/withdraw/controllers/DetailController.php @@ -61,15 +61,33 @@ class DetailController extends BaseController private function incomeModels() { - $incomeModels = Income::getIncomeByIds($this->withdrawModel->type_id) - ->select('id', 'member_id', 'dividend_code', 'incometable_type', 'incometable_id', 'type_name', 'amount', - 'status', 'pay_status', 'created_at', 'order_sn', 'detail') + $incomeModels = Income::uniacid() + ->whereIn('yz_member_income.id', explode(',', $this->withdrawModel->type_id)) + ->select([ + 'yz_member_income.id', + 'yz_member_income.member_id', + 'yz_member_income.dividend_code', + 'yz_member_income.incometable_type', + 'yz_member_income.incometable_id', + 'yz_member_income.type_name', + 'yz_member_income.amount', + 'yz_member_income.status', + 'yz_member_income.pay_status', + 'yz_member_income.created_at', + 'yz_member_income.order_sn', + 'yz_member_income.detail', + 'yz_shareholder_dividend.team_level_name' + ]) ->with(['hasManyOrder' => function ($order) { $order->select('id', 'order_sn', 'status', 'refund_id') ->with(['hasOneRefundApply' => function ($refundApply) { $refundApply->select('id', 'status'); }]); - }])->get(); + }]) + ->leftJoin('yz_shareholder_dividend', function ($join) { + $join->on('yz_shareholder_dividend.id', 'yz_member_income.incometable_id')->where('yz_member_income.dividend_code', 64); + }) + ->get(); //按照前段要求更改数据格式 $incomeModels->map(function ($incomeModel) { diff --git a/resources/views/withdraw/detail.blade.php b/resources/views/withdraw/detail.blade.php index 404145e2..1f4dfe0c 100644 --- a/resources/views/withdraw/detail.blade.php +++ b/resources/views/withdraw/detail.blade.php @@ -197,6 +197,7 @@ +