修改:提现明细 权重分红添加分红等级
This commit is contained in:
parent
69d35e51bd
commit
4948bb5744
|
|
@ -61,15 +61,33 @@ class DetailController extends BaseController
|
||||||
|
|
||||||
private function incomeModels()
|
private function incomeModels()
|
||||||
{
|
{
|
||||||
$incomeModels = Income::getIncomeByIds($this->withdrawModel->type_id)
|
$incomeModels = Income::uniacid()
|
||||||
->select('id', 'member_id', 'dividend_code', 'incometable_type', 'incometable_id', 'type_name', 'amount',
|
->whereIn('yz_member_income.id', explode(',', $this->withdrawModel->type_id))
|
||||||
'status', 'pay_status', 'created_at', 'order_sn', 'detail')
|
->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) {
|
->with(['hasManyOrder' => function ($order) {
|
||||||
$order->select('id', 'order_sn', 'status', 'refund_id')
|
$order->select('id', 'order_sn', 'status', 'refund_id')
|
||||||
->with(['hasOneRefundApply' => function ($refundApply) {
|
->with(['hasOneRefundApply' => function ($refundApply) {
|
||||||
$refundApply->select('id', 'status');
|
$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) {
|
$incomeModels->map(function ($incomeModel) {
|
||||||
|
|
|
||||||
|
|
@ -197,6 +197,7 @@
|
||||||
<el-table-column prop="id" label="收入ID"></el-table-column>
|
<el-table-column prop="id" label="收入ID"></el-table-column>
|
||||||
<el-table-column prop="type_name" label="提现类型"></el-table-column>
|
<el-table-column prop="type_name" label="提现类型"></el-table-column>
|
||||||
<el-table-column prop="amount" label="提现金额"></el-table-column>
|
<el-table-column prop="amount" label="提现金额"></el-table-column>
|
||||||
|
<el-table-column v-if="withdraw.key_name == 'shaerholderDividend'" prop="team_level_name" label="权重等级"></el-table-column>
|
||||||
<el-table-column prop="pay_status_name" label="打款状态"></el-table-column>
|
<el-table-column prop="pay_status_name" label="打款状态"></el-table-column>
|
||||||
<el-table-column prop="created_at" label="提现时间"></el-table-column>
|
<el-table-column prop="created_at" label="提现时间"></el-table-column>
|
||||||
<el-table-column label="操作">
|
<el-table-column label="操作">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue