diff --git a/app/common/repositories/system/merchant/FinancialRecordRepository.php b/app/common/repositories/system/merchant/FinancialRecordRepository.php index adcf076b..5eec9bf1 100755 --- a/app/common/repositories/system/merchant/FinancialRecordRepository.php +++ b/app/common/repositories/system/merchant/FinancialRecordRepository.php @@ -37,20 +37,20 @@ class FinancialRecordRepository extends BaseRepository ,'commission_to_cloud_warehouse','commission_to_cloud_warehouse_refund', 'commission_to_store', 'commission_to_courier', 'commission_to_promoter', 'commission_to_store_refund', 'commission_to_courier_refund', 'commission_to_promoter_refund', 'auto_margin', 'auto_margin_refund', 'supply_chain', 'supply_chain_refund', 'platform_consumption', 'platform_consumption_refund', 'merchant_order', 'merchant_order_refund' ]; - public $typeCnMap = [ + const TYPE_CN_MAP = [ 'order' => '订单支付', - 'order_presell' => '预售订单支付', + 'order_presell' => '预售订单(定金)', 'order_refund' => '订单退款', 'brokerage_one' => '一级分销佣金', 'brokerage_two' => '二级分销佣金', - 'refund_brokerage_one' => '一级分销佣金退款', - 'refund_brokerage_two' => '二级分销佣金退款', + 'refund_brokerage_one' => '返还一级佣金', + 'refund_brokerage_two' => '返还二级佣金', 'refund_order' => '订单退款', 'order_platform_coupon' => '平台优惠券抵扣', 'order_svip_coupon' => '超级会员优惠券抵扣', 'commission_to_service_team' => '服务队佣金', - 'commission_to_platform' => '平台佣金', - 'commission_to_platform_refund' => '平台佣金退款', + 'commission_to_platform' => '平台手续费', + 'commission_to_platform_refund' => '平台手续费退款', 'platform_consumption' => '平台优惠', 'platform_consumption_refund' => '平台优惠退款', 'commission_to_promoter' => '推广人佣金', @@ -59,6 +59,26 @@ class FinancialRecordRepository extends BaseRepository 'auto_margin_refund' => '商户保证金退款', 'merchant_order' => '商户订单', 'merchant_order_refund' => '商户订单退款', + 'supply_chain' => '供应链', + 'presell' => '预售订单(尾款)', + 'order_charge' => '手续费', + 'order_true' => '商户入账', + 'refund_charge' => '返还手续费', + 'refund_true' => '商户返还入账', + 'presell_charge' => '预售订单(手续费)', + 'presell_true' => '商户入账', + 'mer_presell' => '预售订单(总额)', + 'refund_platform_coupon' => '退回优惠券补贴', + 'commission_to_village' => '订单平台佣金', + 'commission_to_town' => '订单平台佣金', + 'commission_to_service_team_refund' => '退回平台佣金', + 'commission_to_village_refund' => '退回平台佣金', + 'commission_to_town_refund' => '退回平台佣金', + 'commission_to_entry_merchant' => '订单平台佣金',//入口店铺佣金 + 'commission_to_cloud_warehouse' => '订单平台佣金',//云仓佣金 + 'commission_to_entry_merchant_refund' => '退回平台佣金', + 'commission_to_cloud_warehouse_refund' => '退回平台佣金', + 'first_order_commission' => '首单拉新', ]; public function __construct(FinancialRecordDao $dao) @@ -808,9 +828,14 @@ class FinancialRecordRepository extends BaseRepository return compact('count', 'number'); } + /** + * 获取财务类型 + * @param $type + * @return string + */ public function getFinancialTypeCn($type) { - return $this->typeCnMap[$type] ?? ''; + return self::TYPE_CN_MAP[$type] ?? ''; } } diff --git a/crmeb/services/ExcelService.php b/crmeb/services/ExcelService.php index 28e1264c..0276e2b6 100755 --- a/crmeb/services/ExcelService.php +++ b/crmeb/services/ExcelService.php @@ -321,57 +321,7 @@ class ExcelService */ public function exportFinancial(array $where, int $page, int $limit, $merchant = []) { - /* - order 收入 公共 新订单 - brokerage_one 支出 公共 一级佣金 - brokerage_two 支出 公共 二级佣金 - order_charge 支出 商户 手续费 - order_true 支出 平台 商户入账 - refund_order 支出 公共 退款 - refund_brokerage_one 收入 公共 返还一级佣金 - refund_brokerage_two 收入 公共 返还二级佣金 - refund_charge 收入 商户 返还手续费 - refund_true 收入 平台 商户返还入账 - presell 收入 公共 新订单 - presell_charge 支出 商户 手续费 - presell_true 支出 平台 商户入账 - supply_chain 供应链商户入账 - */ - $financialType = [ - 'order' => '订单支付', - 'supply_chain' => '供应链', - 'presell' => '预售订单(尾款)', - 'brokerage_one' => '一级佣金', - 'brokerage_two' => '二级佣金', - 'order_charge' => '手续费', - 'order_true' => '商户入账', - 'refund_order' => '退款', - 'refund_charge' => '返还手续费', - 'refund_true' => '商户返还入账', - 'presell_charge' => '预售订单(手续费)', - 'presell_true' => '商户入账', - 'refund_brokerage_one' => '返还一级佣金', - 'refund_brokerage_two' => '返还二级佣金', - 'mer_presell' => '预售订单(总额)', - 'order_presell' => '预售订单(定金)', - 'refund_platform_coupon' => '退回优惠券补贴', - 'order_platform_coupon' => '优惠券补贴', - 'auto_margin' => '押金', - 'commission_to_service_team' => '订单平台佣金', - 'commission_to_platform' => '订单剩余平台手续费', - 'commission_to_village' => '订单平台佣金', - 'commission_to_town' => '订单平台佣金', - 'commission_to_service_team_refund' => '退回平台佣金', - 'commission_to_platform_refund' => '退回剩余平台手续费', - 'commission_to_village_refund' => '退回平台佣金', - 'commission_to_town_refund' => '退回平台佣金', - 'auto_margin_refund' => '退回押金', - 'commission_to_entry_merchant' => '订单平台佣金',//入口店铺佣金 - 'commission_to_cloud_warehouse' => '订单平台佣金',//云仓佣金 - 'commission_to_entry_merchant_refund' => '退回平台佣金', - 'commission_to_cloud_warehouse_refund' => '退回平台佣金', - 'first_order_commission' => '首单拉新', - ]; + $financialType = FinancialRecordRepository::TYPE_CN_MAP; $sys_pm_1 = ['auto_margin','order', 'presell', 'order_charge', 'order_presell', 'presell_charge', 'refund_brokerage_one', 'refund_brokerage_two', 'commission_to_platform']; $mer_pm_1 = ['first_order_commission','order_true','order', 'presell', 'refund_brokerage_one', 'refund_brokerage_two', 'mer_presell', 'order_platform_coupon', 'commission_to_cloud_warehouse', 'commission_to_entry_merchant', 'commission_to_town', 'commission_to_village', 'commission_to_service_team'];