修复支付问题

manage-server/app/Http/Controllers/CommonController.php

@@ -192,13 +192,13 @@ class CommonController extends Controller
                         $data["comment"] = false;
                     }
                     // 未支付订单1小时后过期
-                    if($order->status === 1) {
+                    /*if($order->status === 1) {
                         if(Carbon::now()->subHour()->gt($order->created_at)) {
                             $order->status = 3;
                             $order->save();
                             continue;
                         }
-                    }
+                    }*/
                     array_push($orders, $data);
                 }
             }

manage-server/app/Http/Controllers/PaymentController.php

@@ -24,7 +24,18 @@ class PaymentController extends Controller
         $order_type = $request->input("order_type");
         $order = CommonController::getRecord($order_type, $order_id);
 
+        // 先判断微信交易是否失效，失效的话需要重新生成份新的系统内部订单，再重新统一下单
         if ($wechat_id && $order) {
+            // 判断微信交易是否失效
+            if(Carbon::now()->subHour()->gt($order->created_at)) {
+                $order_new = clone $order;
+                $order_new->id = null;
+                $order_new->save();
+                $order->delete();
+                $order_id = $order_new->id;
+            }
+
+
             $out_trade_no = $order_type . "_" . $order_id;
             $app = app('wechat.payment');