1

app/event.php

@@ -55,7 +55,6 @@ return [
              \crmeb\listens\AuthCancelActivityListen::class,
              \crmeb\listens\CloseUserSvipListen::class,
              \crmeb\listens\SendSvipCouponListen::class,
-             \crmeb\listens\AutoOrderOvertime::class,
         ] : [],
         'pay_success_user_recharge' => [\crmeb\listens\pay\UserRechargeSuccessListen::class],
         'pay_success_user_order' => [\crmeb\listens\pay\UserOrderSuccessListen::class],

crmeb/listens/AutoCancelGroupOrderListen.php

@@ -15,6 +15,7 @@ namespace crmeb\listens;
 
 
 use app\common\repositories\store\order\StoreGroupOrderRepository;
+use app\common\repositories\store\order\StoreOrderRepository;
 use crmeb\interfaces\ListenerInterface;
 use crmeb\services\TimerService;
 use Swoole\Timer;
@@ -28,6 +29,10 @@ class AutoCancelGroupOrderListen extends TimerService implements ListenerInterfa
         $this->tick(60000, function () {
             $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class);
             request()->clearCache();
+
+            $storeOrderRepository = app()->make(StoreOrderRepository::class);
+            $storeOrderRepository->expireOrder();
+
             $timer = ((int)systemConfig('auto_close_order_timer')) ?: 15;
             $time = date('Y-m-d H:i:s', strtotime("- $timer minutes"));
             $groupOrderIds = $storeGroupOrderRepository->getTimeOutIds($time);

crmeb/listens/AutoOrderOvertime.php

@@ -1,34 +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>
-// +----------------------------------------------------------------------
-
-
-namespace crmeb\listens;
-
-
-use app\common\repositories\store\order\StoreOrderRepository;
-use crmeb\interfaces\ListenerInterface;
-use crmeb\services\TimerService;
-use Swoole\Timer;
-use think\facade\Db;
-
-class AutoOrderOvertime extends TimerService implements ListenerInterface
-{
-
-    public function handle($event): void
-    {
-        //TODO 百分比支付，尾款最后支付时间，更改订单状态
-        $this->tick(1000 * 60 * 20, function () {
-            $storeOrderRepository = app()->make(StoreOrderRepository::class);
-            $storeOrderRepository->expireOrder();
-        });
-    }
-}

crmeb/listens/AutoOrderReplyListen.php

@@ -28,8 +28,6 @@ class AutoOrderReplyListen extends TimerService implements ListenerInterface
     {
         $this->tick(1000 * 60 * 60, function () {
             request()->clearCache();
-            $storeOrderRepository = app()->make(StoreOrderRepository::class);
-            $storeOrderRepository->expireOrder();
             if (systemConfig('open_auto_reply') === '0') {
                 return;
             }