diff --git a/app/Console/Commands/Test.php b/app/Console/Commands/Test.php index 645c65e7..0d7079ba 100644 --- a/app/Console/Commands/Test.php +++ b/app/Console/Commands/Test.php @@ -2,6 +2,7 @@ namespace App\Console\Commands; +use App\Payments\AlipayF2F; use App\Services\PaymentService; use Illuminate\Console\Command; @@ -38,7 +39,5 @@ class Test extends Command */ public function handle() { - $paymentService = new PaymentService('MGate'); - var_dump($paymentService->form()); } } diff --git a/app/Http/Controllers/Guest/PaymentController.php b/app/Http/Controllers/Guest/PaymentController.php index 8e2ca8a2..faac907c 100644 --- a/app/Http/Controllers/Guest/PaymentController.php +++ b/app/Http/Controllers/Guest/PaymentController.php @@ -20,7 +20,7 @@ class PaymentController extends Controller if (!$this->handle($verify['trade_no'], $verify['callback_no'])) { abort(500, 'handle error'); } - die('success'); + die(isset($paymentService->customResult) ? $paymentService->customResult : 'success'); } catch (\Exception $e) { abort(500, 'fail'); } diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php index 862358f2..7b11a29d 100644 --- a/app/Services/PaymentService.php +++ b/app/Services/PaymentService.php @@ -7,6 +7,12 @@ use App\Models\Payment; class PaymentService { + public $method; + public $customResult; + protected $class; + protected $config; + protected $payment; + public function __construct($method, $id = NULL, $uuid = NULL) { $this->method = $method; @@ -22,6 +28,7 @@ class PaymentService $this->config['uuid'] = $payment['uuid']; }; $this->payment = new $this->class($this->config); + if (isset($this->payment->customResult)) $this->customResult = $this->payment->customResult; } public function notify($params)