修复错误

app/common/repositories/system/merchant/FinancialRecordRepository.php

@@ -432,7 +432,7 @@ class FinancialRecordRepository extends BaseRepository
                 [
                     '平台手续费',
                     bcsub($expend['number_order_charge'],$expend['number_charge'],2) .'元',
-                    $expend['count_charge']+$expend['count_order_charge'].'笔'
+                    bcsub($expend['count_order_charge'],$expend['count_charge']).'笔'
                 ],
                 [
                     '佣金',
@@ -557,7 +557,6 @@ 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 = ['refund_brokerage_two','refund_brokerage_one'];
             [$data['count_refund_brokerage'],$data['number_refund_brokerage']] = $this->dao->getDataByType($type, $where, $date, $financialType);
@@ -578,9 +577,8 @@ class FinancialRecordRepository extends BaseRepository
             //退回收入 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'] + $data['count_refund_brokerage'] + $data['count_svipcoupon'];
+            $data['count']  = $data['count_brokerage'] + $data['count_refund'] + $data['count_order_charge'] + $data['count_refund_brokerage'] + $data['count_svipcoupon']-$data['count_charge'];
             $data['number'] =bcadd(bcadd($number_2,$number,3),$number_1,2);
-
         }else{ //平台的
             // 退回 订单实际获得金额
 

app/event.php.bak

@@ -1,67 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
-
-// 事件定义文件
-return [
-    'bind' => [],
-
-    'listen' => [
-        'AppInit' => [],
-        'HttpRun' => [],
-        'HttpEnd' => [],
-        'LogLevel' => [],
-        'LogWrite' => [],
-        'swoole.task' => [\crmeb\listens\SwooleTaskListen::class],
-        'swoole.init' => [
-            \crmeb\listens\InitSwooleLockListen::class,
-            \crmeb\listens\CreateTimerListen::class,
-//            \crmeb\listens\QueueListen::class,
-        ],
-        'swoole.workerStart' => [\app\webscoket\SwooleWorkerStart::class],
-        'swoole.workerExit' => [\crmeb\listens\SwooleWorkerExitListen::class],
-        'swoole.workerError' => [\crmeb\listens\SwooleWorkerExitListen::class],
-        'swoole.workerStop' => [\crmeb\listens\SwooleWorkerExitListen::class],
-        'create_timer' => env('INSTALLED', false) ? [
-             \crmeb\listens\AutoOrderProfitsharingListen::class,
-             \crmeb\listens\AuthTakeOrderListen::class,
-             \crmeb\listens\AutoCancelGroupOrderListen::class,
-             \crmeb\listens\AuthCancelPresellOrderListen::class,
-             \crmeb\listens\AutoUnLockBrokerageListen::class,
-             \crmeb\listens\AutoSendPayOrderSmsListen::class,
-             \crmeb\listens\SyncSmsResultCodeListen::class,
-             \crmeb\listens\SyncBroadcastStatusListen::class,
-             \crmeb\listens\ExcelFileDelListen::class,
-             \crmeb\listens\RefundOrderAgreeListen::class,
-             \crmeb\listens\SeckillTImeCheckListen::class,
-             \crmeb\listens\AutoOrderReplyListen::class,
-             \crmeb\listens\ProductPresellStatusListen::class,
-             \crmeb\listens\ProductGroupStatusCheckListen::class,
-             \crmeb\listens\SyncSpreadStatusListen::class,
-             \crmeb\listens\GuaranteeCountListen::class,
-             \crmeb\listens\AutoUnLockIntegralListen::class,
-             \crmeb\listens\AutoClearIntegralListen::class,
-             \crmeb\listens\MerchantApplyMentsCheckListen::class,
-             \crmeb\listens\AutoUnlockMerchantMoneyListen::class,
-             \crmeb\listens\SumCountListen::class,
-             \crmeb\listens\SyncHotRankingListen::class,
-             \crmeb\listens\AuthCancelActivityListen::class,
-             \crmeb\listens\CloseUserSvipListen::class,
-             \crmeb\listens\SendSvipCouponListen::class,
-        ] : [],
-        'pay_success_user_recharge' => [\crmeb\listens\pay\UserRechargeSuccessListen::class],
-        'pay_success_user_order' => [\crmeb\listens\pay\UserOrderSuccessListen::class],
-        'pay_success_order' => [\crmeb\listens\pay\OrderPaySuccessListen::class],
-        'pay_success_presell' => [\crmeb\listens\pay\PresellPaySuccessListen::class],
-        'pay_success_meal' => [\crmeb\listens\pay\MealSuccessListen::class],
-    ],
-
-    'subscribe' => [],
-];