diff --git a/app/controller/admin/system/merchant/FinancialRecord.php b/app/controller/admin/system/merchant/FinancialRecord.php index 72cf73e6..05e556dc 100644 --- a/app/controller/admin/system/merchant/FinancialRecord.php +++ b/app/controller/admin/system/merchant/FinancialRecord.php @@ -37,9 +37,11 @@ class FinancialRecord extends BaseController $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']; + $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_refun','commission_to_platform','commission_to_platform_refun','commission_to_village','commission_to_village_refun','commission_to_town','commission_to_town_refun']; } 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', '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_refun','commission_to_platform','commission_to_platform_refun','commission_to_village','commission_to_village_refun','commission_to_town','commission_to_town_refun']; } return app('json')->success($this->repository->getList($where, $page, $limit)); } diff --git a/crmeb/services/ExcelService.php b/crmeb/services/ExcelService.php index 0a6599b0..5f37dc29 100644 --- a/crmeb/services/ExcelService.php +++ b/crmeb/services/ExcelService.php @@ -352,6 +352,14 @@ class ExcelService 'order_presell' => '预售订单(定金)', 'refund_platform_coupon' => '退回优惠券补贴', 'order_platform_coupon' => '优惠券补贴', + 'commission_to_service_team'=>'订单平台佣金', + 'commission_to_platform'=>'订单剩余平台手续费', + 'commission_to_village'=>'订单平台佣金', + 'commission_to_town'=>'订单平台佣金', + 'commission_to_service_team_refun'=>'退回平台佣金', + 'commission_to_platform_refun'=>'退回剩余平台手续费', + 'commission_to_village_refun'=>'退回平台佣金', + 'commission_to_town_refun'=>'退回平台佣金', ]; $sys_pm_1 = ['order','presell','order_charge','order_presell','presell_charge','refund_brokerage_one','refund_brokerage_two']; $mer_pm_1 = ['order','presell','refund_charge','refund_brokerage_one','refund_brokerage_two','mer_presell','order_platform_coupon'];