diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php
index 48fb812..d4191ef 100644
--- a/app/Http/Controllers/Api/OrderController.php
+++ b/app/Http/Controllers/Api/OrderController.php
@@ -74,20 +74,20 @@ class OrderController extends Controller
 				}, $v['pictures']);
 			}
 
-			//10分钟内未付款订单提示付款 TODO 此部分由定时
-			/*if ($v['status'] == Status::UNPAID) {
-				$minute = $time - strtotime($v['created_at']);
-				//订单创建后10分钟内未付款则提示，否则取消订单
-				if ($minute < 600) {
-					$v['status_text'] = '请在' . ceil($minute / 60) . '分钟内付款';
-				} else {
+			//未付款订单提示剩余付款时间
+			if ($v['status'] == Status::UNPAID) {
+				$second = strtotime($v['timeout']) - $time;
+
+				if ($second > 0) {
+					$v['status_text'] = '请在' . ceil($second / 60) . '分钟内付款';
+				} /*else { //TODO 此部分由定时
 					$timeout_ids[] = $v['id'];
 					$v['status'] = Status::CANCEL;
 					$v['status_text'] = '已取消';
 					//TODO 加回库存，未考虑到几天/几个月后再打开订单列表页的情况，需要定时任务处理
 					Product::query()->find($v['product_id'])->increment('stock', $v['num']);
-				}
-			}*/
+				}*/
+			}
 		}
 
 		//超时订单设置为已取消 TODO 测试阶段暂时注释
diff --git a/app/Http/Controllers/Api/WxpayController.php b/app/Http/Controllers/Api/WxpayController.php
index 938c0a2..242e56e 100644
--- a/app/Http/Controllers/Api/WxpayController.php
+++ b/app/Http/Controllers/Api/WxpayController.php
@@ -80,6 +80,7 @@ class WxpayController
 
 							$order->paid_at = now();
 							$order->paid_money = DB::raw('`paid_money` + ' . $money);
+							$order->timeout = null; //清除超时时间
 							$order->save();
 
 							//增加销量，库存在拍下时已经减了