wanma-benteng
/
new-admin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加：资金流水信息输出用户和商户信息

This commit is contained in:
wuhui_zzw 2024-04-19 17:26:20 +08:00
parent 8fcd978be1
commit 2b600eba59
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/common/dao/system/merchant/FinancialRecordDao.php
View File

@ -73,7 +73,15 @@ class FinancialRecordDao extends BaseDao
}else{
$query->where('type','in',[1,2]);
}
});
})
->with([
'merchant' => function($query){
$query->field('mer_id,mer_avatar,mer_name');
},
'user' => function($query){
$query->field('uid,nickname,avatar');
}
]);
return $query;
}

33
app/controller/admin/system/merchant/FinancialRecord.php
View File

@ -27,11 +27,36 @@ class FinancialRecord extends BaseController
[$page, $limit] = $this->getPage();
$where = $this->request->params(['keyword', 'date', 'mer_id']);
$merId = $this->request->merId();
if ($merId) {
if($merId){
$where['mer_id'] = $merId;
$where['financial_type'] = ['order', 'mer_accoubts', 'brokerage_one', 'brokerage_two', 'refund_brokerage_one', 'refund_brokerage_two', 'refund_order','order_platform_coupon','order_svip_coupon'];
} else {
$where['financial_type'] = ['order', 'sys_accoubts', 'brokerage_one', 'brokerage_two', 'refund_brokerage_one', 'refund_brokerage_two', 'refund_order','order_platform_coupon','order_svip_coupon'];
$where['financial_type'] = [
'order',
'mer_accoubts',
'brokerage_one',
'brokerage_two',
'refund_brokerage_one',
'refund_brokerage_two',
'refund_order',
'order_platform_coupon',
'order_svip_coupon',
'province_mer',
'supplier_mer'
];
}
else{
$where['financial_type'] = [
'order',
'sys_accoubts',
'brokerage_one',
'brokerage_two',
'refund_brokerage_one',
'refund_brokerage_two',
'refund_order',
'order_platform_coupon',
'order_svip_coupon',
'province_mer',
'supplier_mer'
];
}
return app('json')->success($this->repository->getList($where, $page, $limit));
}