diff --git a/app/Console/Commands/UsdtAddrGetList.php b/app/Console/Commands/UsdtAddrGetList.php index 91af732..731572b 100644 --- a/app/Console/Commands/UsdtAddrGetList.php +++ b/app/Console/Commands/UsdtAddrGetList.php @@ -164,7 +164,7 @@ class UsdtAddrGetList extends Command */ public function updateTimeoutAddr(){ $allOrder = Order::where(['pay_type'=>'1017','usdt_addr_status'=>'0']) - ->where('order_at','<',date('Y-m-d H:i:s',strtotime("-20 minute")))->limit(100)->get(); + ->where('order_at','<',date('Y-m-d H:i:s',strtotime("-60 minute")))->limit(100)->get(); if(empty($allOrder)){ return; } diff --git a/app/ServicePay/ApiOrderServices.php b/app/ServicePay/ApiOrderServices.php index 0c1d848..25398b2 100644 --- a/app/ServicePay/ApiOrderServices.php +++ b/app/ServicePay/ApiOrderServices.php @@ -128,8 +128,14 @@ class ApiOrderServices //检查商户 $this->checkMerchant($request); + if (count(self::$errorArr) > 0) { + return $this->msg($this->errorFormat()); + } //检查签名 $this->checkSign($this->merchant, $request); + if (count(self::$errorArr) > 0) { + return $this->msg($this->errorFormat()); + } //通道检查 $this->checkGateway($request); if (count(self::$errorArr) > 0) { diff --git a/app/ServicePay/UsdtWalletServices.php b/app/ServicePay/UsdtWalletServices.php index de6ecbb..e0ba4d8 100644 --- a/app/ServicePay/UsdtWalletServices.php +++ b/app/ServicePay/UsdtWalletServices.php @@ -396,7 +396,7 @@ class UsdtWalletServices extends BasePay implements PayApiInterface private function getUstdAddr(){ DB::beginTransaction(); $addr = UsdtAddr::where('is_checked',1)->orderby('updated_at','asc')->first(); - if (!$addr){ + if (!empty($addr)){ $addr['is_checked'] = 0; $ret = $addr['addr']; $r = $addr->save();