feat(process/Task.php): 调整任务调度，增加定时任务处理逻辑

app/queue/redis/TaskRechargeQuerySend.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace app\queue\redis;
+
+use app\common\logic\PayNotifyLogic;
+use app\common\model\retail\Cashierclass;
+use app\common\model\store_order\StoreOrder;
+use app\common\model\user_recharge\UserRecharge;
+use app\common\service\pay\PayService;
+use app\common\service\PushService;
+use Webman\RedisQueue\Consumer;
+use support\exception\BusinessException;
+
+/**
+ * 微信条码支付队列消费
+ */
+class TaskRechargeQuerySend implements Consumer
+{
+    // 要消费的队列名
+    public $queue = 'task-recharge-query';
+
+    // 连接名，对应 plugin/webman/redis-queue/redis.php 里的连接`
+    public $connection = 'default';
+
+    // 消费
+    public function consume($data)
+    {
+        $pay = new PayService();
+        $order = [
+            'out_trade_no' => $data['order_id'],
+        ];
+        $res = $pay->wechat->query($order);
+        if ($res['trade_state'] == 'SUCCESS' && $res['trade_state_desc'] == '支付成功') {
+            if(isset($data['pay_type']) && $data['pay_type']=='recharge'){
+                PayNotifyLogic::handle('recharge', $res['out_trade_no'], $res);
+            }
+        }
+    }
+    // 消费失败时
+    public function onConsumeFailure(\Throwable $exception, $package)
+    {
+        return $package;
+    }
+}

process/Task.php

@@ -6,6 +6,8 @@ use app\common\model\store_branch_product\StoreBranchProduct;
 use app\common\model\store_order\StoreOrder;
 use app\common\model\store_order_cart_info\StoreOrderCartInfo;
 use app\common\model\store_product\StoreProduct;
+use app\common\model\user_recharge\UserRecharge;
+use Webman\RedisQueue\Redis;
 use Workerman\Crontab\Crontab;
 
 class Task
@@ -13,13 +15,13 @@ class Task
     public function onWorkerStart()
     {
 
-        // 每5分钟执行一次
+        // 每10分钟执行一次
         new Crontab('0 */10 * * * *', function () {
             $where = ['paid' => 0];
             $where[] = ['create_time', '<', time() - 600]; // 10分钟前创建的订单
             // 删除10分钟未支付的订单
             $oid = StoreOrder::where($where)->column('id'); // 删除时间设置为当前时间，即删除
-            if($oid){
+            if ($oid) {
                 StoreOrder::where('id', 'in', $oid)->update(['delete_time' => time()]);
                 $arr = StoreOrderCartInfo::where('oid', 'in', $oid)->field('store_id,product_id,cart_num')->select();
                 $updateData = [];
@@ -38,6 +40,23 @@ class Task
                 (new StoreProduct())->saveAll($updateDataTwo);
             }
 
+            // 获取当前时间
+            $now = time();
+            // 计算一个小时前的时间戳
+            $oneHourAgo = $now - 3600;
+            //删除未充值的订单
+            UserRecharge::where('paid', 0)->where('status', 1)->where('create_time', '<', $oneHourAgo)->update(['delete_time' => time()]);
+        });
+
+        new Crontab('0 */1 * * * *', function () {
+            $endTime = time();
+
+            // 计算10分钟前的时间戳
+            $startTime = $endTime - 10 * 60;
+            $arr = UserRecharge::where('paid', 0)->where('status', 1)->whereBetweenTime('create_time', $startTime, $endTime)->column('order_id');
+            foreach ($arr as $v) {
+                Redis::send('task-recharge-query', ['order_id' => $v]);
+            }
         });
     }
 }