|
|
@@ -103,7 +103,8 @@ class AccountService extends BaseService
|
|
|
{
|
|
|
$userId = isset($params['user_id'])?$params['user_id'] : 0;
|
|
|
$list = PayOrdersModel::from('pay_orders as a')
|
|
|
- ->where(['user_id'=> $userId,'status'=>1,'mark'=>1])
|
|
|
+ ->where('status','>',1)
|
|
|
+ ->where(['user_id'=> $userId,'mark'=>1])
|
|
|
->select(['a.*'])
|
|
|
->orderBy('a.create_time','desc')
|
|
|
->orderBy('a.id','desc')
|
|
|
@@ -336,6 +337,8 @@ class AccountService extends BaseService
|
|
|
// 用户操作记录
|
|
|
DB::commit();
|
|
|
$this->error = '创建充值订单成功，请前往支付～';
|
|
|
+ // 删除超时订单
|
|
|
+ PayOrdersModel::where(['status'=>1])->where('create_time','<=', time() - 6 * 3600)->delete();
|
|
|
RedisService::clear($cacheKey . '_lock');
|
|
|
return [
|
|
|
'order_id' => $orderId,
|
