diff --git a/app/Http/Api/Services/Trade.php b/app/Http/Api/Services/Trade.php index f9e6d16b..7b487784 100644 --- a/app/Http/Api/Services/Trade.php +++ b/app/Http/Api/Services/Trade.php @@ -5,6 +5,7 @@ namespace App\Http\Api\Services; use App\Models\Client as ClientModel; use App\Models\Trade as TradeModel; use App\Services\Logic\OrderTrait; +use App\Services\Logic\Trade\TradeInfo; use App\Services\Logic\TradeTrait; use App\Services\Pay\Alipay; use App\Services\Pay\Wxpay; @@ -60,7 +61,7 @@ class Trade extends Service $payment = ['redirect' => $redirect]; return [ - 'trade' => $trade, + 'trade' => $this->handleTradeInfo($trade->sn), 'payment' => $payment, ]; } @@ -122,4 +123,11 @@ class Trade extends Service return $this->request->getHeader('X-Platform'); } + protected function handleTradeInfo($sn) + { + $service = new TradeInfo(); + + return $service->handle($sn); + } + } diff --git a/app/Http/Home/Controllers/PublicController.php b/app/Http/Home/Controllers/PublicController.php index caf20974..944e162b 100644 --- a/app/Http/Home/Controllers/PublicController.php +++ b/app/Http/Home/Controllers/PublicController.php @@ -80,7 +80,7 @@ class PublicController extends \Phalcon\Mvc\Controller */ public function alipayCallbackAction() { - return $this->response->redirect('/h5/#/pages/uc/orders', true); + return $this->response->redirect('/h5/#/pages/me/orders', true); } /** @@ -88,7 +88,7 @@ class PublicController extends \Phalcon\Mvc\Controller */ public function wxpayCallbackAction() { - return $this->response->redirect('/h5/#/pages/uc/orders', true); + return $this->response->redirect('/h5/#/pages/me/orders', true); } /**