|
|
@@ -651,14 +651,15 @@ class MerchantService extends BaseService
|
|
|
$merchantUsdt = isset($merchant['usdt'])? $merchant['usdt'] : 0;
|
|
|
$merchantId = isset($merchant['id'])? $merchant['id'] : 0;
|
|
|
$merchantTradeStatus = isset($merchant['trade_status'])? $merchant['trade_status'] : 0;
|
|
|
- if(empty($userInfo) || $status != 1){
|
|
|
- $this->error = 2024;
|
|
|
- return false;
|
|
|
- }
|
|
|
return [
|
|
|
'$userInfo'=> $userInfo,
|
|
|
'$merchant'=> $merchant,
|
|
|
];
|
|
|
+ if(empty($userInfo) || $status != 1){
|
|
|
+ $this->error = 2024;
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
if($userType == 2 && (empty($merchant) || !in_array($merchantTradeStatus,[1,2]))){
|
|
|
$this->error = 2024;
|
|
|
return false;
|