diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 4aadd743..381c71cd 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -322,7 +322,7 @@ class StoreOrderRepository extends BaseRepository 'user_id' => $uid, 'financial_type' => 'supply_chain', 'financial_pm' => 0, - 'type' => 0, + 'type' => 1, 'number' => $_payPrice, 'mer_id' => $order->mer_id, 'financial_record_sn' => $financeSn . ($i++) diff --git a/app/common/repositories/system/merchant/FinancialRecordRepository.php b/app/common/repositories/system/merchant/FinancialRecordRepository.php index d8e9c534..c5f26e99 100644 --- a/app/common/repositories/system/merchant/FinancialRecordRepository.php +++ b/app/common/repositories/system/merchant/FinancialRecordRepository.php @@ -495,6 +495,11 @@ class FinancialRecordRepository extends BaseRepository $expend['count_auto_margin'] . '笔' ], + [ + '自动下单市供应链', + $expend['number_supply_chain'] . '元', + $expend['count_supply_chain'] . '笔' + ], [ '佣金', bcsub($expend['number_brokerage'], $expend['number_refund_brokerage'], 2) . '元', @@ -673,7 +678,10 @@ class FinancialRecordRepository extends BaseRepository //平台手续费 $financialType = ['order_charge', 'presell_charge']; [$data['count_order_charge'], $data['number_order_charge']] = $this->dao->getDataByType($type, $where, $date, $financialType); - + + //转给市级供应链 + $financialType = ['supply_chain']; + [$data['count_supply_chain'], $data['number_supply_chain']] = $this->dao->getDataByType($type, $where, $date, $financialType); //商户押金 $financialType = ['auto_margin']; [$data['count_auto_margin'], $data['number_auto_margin']] = $this->dao->getDataByType($type, $where, $date, $financialType); @@ -705,10 +713,19 @@ class FinancialRecordRepository extends BaseRepository $number = bcsub($data['number_brokerage'], $data['number_refund_brokerage'], 2); //平台手续费 =( order_charge + 预售手续费 presell_charge - 平台退给商户的手续费 refund_charge ) $number_1 = bcsub($data['number_order_charge'], $data['number_charge'], 2); + if($data['number_supply_chain']>0){ + $financialType = ['order_true']; + $where['type']=2; + $where['mer_id']=$where['is_mer']; + unset($where['is_mer']); + [$data['count_order'], $data['number_order']] = $this->dao->getDataByType($type, $where, $date, $financialType); + $number_1=bcadd($number_1, $data['number_supply_chain'], 2); + $number_1=bcsub( $number_1, $data['number_order'], 2); + } //退回收入 refund_order + 退回佣金 $number_2 = bcadd(bcadd($data['number_refund'], $data['number_coupon'], 2), $data['number_svipcoupon'], 2); - $data['count'] = $data['count_brokerage'] + $data['count_refund'] + $data['count_order_charge'] + $data['count_refund_brokerage'] + $data['count_svipcoupon'] + $data['count_auto_margin']-$data['count_charge']; + $data['count'] =$data['count_supply_chain']+ $data['count_brokerage'] + $data['count_refund'] + $data['count_order_charge'] + $data['count_refund_brokerage'] + $data['count_svipcoupon'] + $data['count_auto_margin']-$data['count_charge']; $data['number'] = bcadd(bcadd($number3,bcadd($number_2, $number, 2),2), $number_1, 2); } else { //平台的 diff --git a/crmeb/services/ExcelService.php b/crmeb/services/ExcelService.php index 34e8196f..ea30dad9 100644 --- a/crmeb/services/ExcelService.php +++ b/crmeb/services/ExcelService.php @@ -370,8 +370,9 @@ class ExcelService 'commission_to_cloud_warehouse' => '订单平台佣金', 'commission_to_entry_merchant_refund' => '退回平台佣金', 'commission_to_cloud_warehouse_refund' => '退回平台佣金', + 'first_order_commission' => '首单拉新', ]; - $sys_pm_1 = ['order', 'presell', 'order_charge', 'order_presell', 'presell_charge', 'refund_brokerage_one', 'refund_brokerage_two', 'commission_to_platform']; + $sys_pm_1 = ['first_order_commission','supply_chain','order', 'presell', 'order_charge', 'order_presell', 'presell_charge', 'refund_brokerage_one', 'refund_brokerage_two', 'commission_to_platform']; $mer_pm_1 = ['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']; $date_ = $where['date'];