3333

app/Services/SanJinRechargeService.php

@@ -178,18 +178,15 @@ class SanJinRechargeService extends BaseService
             }else{
                 $text .= lang("充值类型")."：".lang($item->bank_name)."\n";
             }
-            if($item->type == 1){
-                if((time() - strtotime($item->created_at)) > 600 && $item->status == 1){
-                    // 超过10分钟未处理，视为超时
-                    $status = [lang('待处理'), lang('已超时'), lang('成功'), lang('失败')];
-                }else{
-                    $status = [lang('待处理'), lang('已超时'), lang('成功'), lang('失败')];
-                }
+
+            $status = [lang('待处理'), lang('处理中'), lang('成功'), lang('失败')];
+            
+            if($item->type == 1 && $item->created_at < date('Y-m-d H:i:s',time() - 600) && $item->status == 1){
+                $text .= lang('状态')."：".lang("已超时")."\n";
             }else{
-                $status = [lang('待处理'), lang('处理中'), lang('成功'), lang('失败')];
+                $text .= lang('状态')."：{$status[$item->status]}\n";
+
             }
-            
-            $text .= lang('状态')."：{$status[$item->status]}\n";
             if ($item->remark) {
                 $text .= lang('说明')."：{$item->remark}\n";
             }