From 96c0ef8757ebe9c06d03d7ca062c1360ba032e98 Mon Sep 17 00:00:00 2001
From: hellcat <>
Date: Fri, 10 Oct 2025 15:32:54 +0800
Subject: [PATCH] no message

---
 src/Controllers/User/OrderController.php |  2 ++
 src/Controllers/User/PlanController.php  |  1 +
 src/Services/Cron.php                    | 14 +++++++-------
 src/Services/Gateway/Epay.php            |  8 ++++++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/Controllers/User/OrderController.php b/src/Controllers/User/OrderController.php
index ed64e13dd..9768f293e 100755
--- a/src/Controllers/User/OrderController.php
+++ b/src/Controllers/User/OrderController.php
@@ -57,6 +57,7 @@ final class OrderController extends BaseController
      */
     public function create(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
+        echo 123;exit;
         $product_id = $this->antiXss->xss_clean($request->getQueryParams()['product_id']) ?? null;
         $redir = Cookie::get('redir');
 
@@ -119,6 +120,7 @@ final class OrderController extends BaseController
 
     public function process(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
+        echo 123;exit;
         $coupon_raw = $this->antiXss->xss_clean($request->getParam('coupon'));
         $product_id = $this->antiXss->xss_clean($request->getParam('product_id'));
 
diff --git a/src/Controllers/User/PlanController.php b/src/Controllers/User/PlanController.php
index 494ae28ec..f6e06c231 100755
--- a/src/Controllers/User/PlanController.php
+++ b/src/Controllers/User/PlanController.php
@@ -26,6 +26,7 @@ final class PlanController extends BaseController
         $iPage = $args['page'] ?? 1;
         
         $oOrder = Order::where("user_id", $this->user->id)
+            ->where("product_code", "!=", "code")
             ->orderByRaw("CASE
                 WHEN status = 'payment_pending' THEN 1 
                 WHEN status = 'activated' THEN 2 
diff --git a/src/Services/Cron.php b/src/Services/Cron.php
index 452531a7f..98ca75461 100755
--- a/src/Services/Cron.php
+++ b/src/Services/Cron.php
@@ -816,7 +816,7 @@ final class Cron
         $iPayClass = $_ENV["user_payClass"];
         
         $pending_payment_orders = (new Order())->where('status', 'payment_pending')->get(); // 这里还是无脑检索order了，但是现在order表可以只保留一年内数据，问题不大
-
+//tomd($pending_payment_orders, 1);
         $aUserInQueue = []; // 用户可能在5分钟之内多次下单，但一次只处理一个，坚固
         foreach ($pending_payment_orders as $oOrder) {
                 
@@ -825,7 +825,7 @@ final class Cron
             }
             
             $aUserInQueue[] = $oOrder->user_id;
-            
+//            tomd($aUserInQueue, 1);
             try {
                 
                 $invoice = (new Invoice())->where('order_id', $oOrder->id)->first();
@@ -858,6 +858,10 @@ final class Cron
                             '钱包充值 #账单号：'.$invoice->id
                         );
                         
+                        $oOrder->status = "code_done";
+                        $oOrder->_save();
+                        
+                        self::_helper_log("订单".$oOrder->id."钱包充值到账");
                     } else if ($oUser->class < $iPayClass) { // 当前无套餐，直接进激活队列
                         
 //                        $oPlanPending = new Order();
@@ -869,7 +873,6 @@ final class Cron
                         $oPlanQueue->_add($oOrder, "new");
                         
                         self::_helper_log("订单".$oOrder->id."进入到激活队列");
-                        
                     } else { // 当前有套餐，进入pending表
                         
 //                        $oPlanPending = new PlanPending();
@@ -878,10 +881,7 @@ final class Cron
                         $oOrder->_save();
                         
                         self::_helper_log("订单".$oOrder->id."转为待激活状态");
-                        
                     }
-                    
-//                    $oOrder->delete();
 
                 } else if ($oOrder->create_time + 86400 < time()) {
                     
@@ -1217,7 +1217,7 @@ final class Cron
                 $oUser->save();
                 
                 //// activated转移到expired
-                $oPlanActivated = PlanActivated::where("user_id", $oPlanExpireQueue->user_id)->first(); // 必然有，没有自然报错，user唯一
+//                $oPlanActivated = PlanActivated::where("user_id", $oPlanExpireQueue->user_id)->first(); // 必然有，没有自然报错，user唯一
                 $oPlanActivated = Order::where("user_id", $oPlanExpireQueue->user_id)->where("status", "activated")->first();
                 
                 if ($oPlanActivated) {
diff --git a/src/Services/Gateway/Epay.php b/src/Services/Gateway/Epay.php
index d22c3587c..19aa70acc 100755
--- a/src/Services/Gateway/Epay.php
+++ b/src/Services/Gateway/Epay.php
@@ -119,8 +119,7 @@ final class Epay extends Base
         //// 本地直接成功
         if ($_ENV['is_loc'] == true || $user->is_admin === 1) {
             
-            // 直接成功
-            $this->postPayment($pl->tradeno);
+            $this->postPayment($pl->tradeno); // 直接成功
 
             return $response->withJson([
                                        'ret' => 'success',
@@ -164,10 +163,14 @@ final class Epay extends Base
                 throw new Exception("code不等于1");
             }
             
+//            $sType = "url";
+//            $sQrcode = "";
             // 如果没有payurl,把qrcode当payurl
             if (!isset($resData['payurl'])) {
                 if (isset($resData['qrcode'])) {
                     $resData['payurl'] = $resData['qrcode'];
+//                    $sType = "qrcode";
+//                    $sQrcode = $resData['qrcode'];
                 } else {
                     throw new Exception("没有payurl，也没有qrcode");
                 }
@@ -178,6 +181,7 @@ final class Epay extends Base
                                        'msg' => 'Payment success',
                                        'type'=> 'url',
                                        'url' => $resData['payurl'],
+//                                       'qrcode' => $sQrcode,
                                        ]);
 //            原来的
 //            return $response->withHeader('HX-Redirect', $resData['payurl'])->withJson([