gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-24 20:06:09 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'remotes/gitee/develop' into demo

Browse Source 
# Conflicts:
#	app/Http/Api/Services/Trade.php
#	app/Http/Home/Controllers/PublicController.php
This commit is contained in:
xiaochong0302 2020-12-02 15:19:23 +08:00
commit 167dab9f3f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Api/Services/Trade.php
View File

@ -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);
}
}

4
app/Http/Home/Controllers/PublicController.php
View File

@ -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);
}
/**