|
|
@@ -655,7 +655,10 @@ class MerchantService extends BaseService
|
|
|
$this->error = 2024;
|
|
|
return false;
|
|
|
}
|
|
|
-
|
|
|
+ return [
|
|
|
+ '$userInfo'=> $userInfo,
|
|
|
+ '$merchant'=> $merchant,
|
|
|
+ ];
|
|
|
if($userType == 2 && (empty($merchant) || !in_array($merchantTradeStatus,[1,2]))){
|
|
|
$this->error = 2024;
|
|
|
return false;
|