mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 数据之眼-账单详情

Browse Source
This commit is contained in:
chenbo 2023-12-08 14:21:15 +08:00
parent 13e302f755
commit 0b47e1c59b
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/controller/api/dataview/Finance.php
View File

@ -64,19 +64,30 @@ class Finance extends BaseController
public function financialRecord(FinancialRecordRepository $repository)
{
[$page, $limit] = $this->getPage();
$where = $this->request->params(['keyword', 'date', 'mer_id']);
$merId = $this->request->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','commission_to_service_team','commission_to_service_team_refund','commission_to_platform','commission_to_platform_refund','commission_to_village','commission_to_village_refund','commission_to_town','commission_to_town_refund','commission_to_entry_merchant','commission_to_entry_merchant_refund'
,'commission_to_cloud_warehouse','commission_to_cloud_warehouse_refund'];
} 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','commission_to_service_team','commission_to_service_team_refund','commission_to_platform','commission_to_platform_refund','commission_to_village','commission_to_village_refund','commission_to_town','commission_to_town_refund'
,'commission_to_entry_merchant','commission_to_entry_merchant_refund'
,'commission_to_cloud_warehouse','commission_to_cloud_warehouse_refund'];
$where = $this->request->params([['type',1],'date']);
$where['is_mer'] = $this->request->merId() ?? 0 ;
try {
$merchant = $this->request->merchant();
}catch (\Exception $e){
$merchant = [];
}
return app('json')->success($repository->getList($where, $page, $limit));
$data = $repository->getAdminList($where,$page, $limit,$merchant);
return app('json')->success($data);
}
public function financialDetail($type)
{
$repository = app()->make(FinancialRecordRepository::class);
$date = $this->request->param('date');
$where['date'] = empty($date) ? date('Y-m-d',time()) : $date ;
$where['is_mer'] = $this->request->merId() ?? 0 ;
if($this->request->merId()){
$merchant = $this->request->merchant();
$data = $repository->merDetail($type,$where,$merchant);
}else{
$data = $repository->adminDetail($type,$where);
}
return app('json')->success($data);
}
}

1
route/api.php
View File

@ -762,6 +762,7 @@ Route::group('api/', function () {
Route::get('bill_list', 'Finance/billList');
Route::get('financial_record_title', 'Finance/financialRecordTitle');
Route::get('financial_record', 'Finance/financialRecord');
Route::get('financial_detail/:type', 'Finance/financialDetail');