diff --git a/app/Controller/v3/OrderOfflineController.php b/app/Controller/v3/OrderOfflineController.php index 5951e52..c53fb05 100644 --- a/app/Controller/v3/OrderOfflineController.php +++ b/app/Controller/v3/OrderOfflineController.php @@ -2,7 +2,10 @@ namespace App\Controller\v3; +use App\Constants\v3\ErrorCode; use App\Controller\BaseController; +use App\Exception\ErrorCodeException; +use App\Model\v3\OrderMain; use App\Request\v3\OrderOfflineRequest; use App\Request\v3\OrderOnlineRequest; use App\Service\v3\Interfaces\OrderOfflineServiceInterface; @@ -65,4 +68,23 @@ class OrderOfflineController extends BaseController ); return $this->success(['data' => $data]); } + + /** + * 当面付完成页 + */ + public function completePage() + { + $globalOrderId = $this->request->input('global_order_id', 0); + $userId = $this->request->input('user_id', 0); + $orderMain = OrderMain::query() + ->with('orders.store') + ->where(['global_order_id' => $globalOrderId, 'user_id' => $userId]) + ->first(); + + if (empty($orderMain)) { + throw new ErrorCodeException(ErrorCode::ORDER_NOT_AVAILABLE); + } + + return $this->success(['order_main' => $orderMain]); + } } \ No newline at end of file diff --git a/app/Service/v3/Implementations/OrderOfflineService.php b/app/Service/v3/Implementations/OrderOfflineService.php index 2b8f35d..9e41a25 100644 --- a/app/Service/v3/Implementations/OrderOfflineService.php +++ b/app/Service/v3/Implementations/OrderOfflineService.php @@ -92,7 +92,10 @@ class OrderOfflineService implements OrderOfflineServiceInterface Db::commit(); // 支付 - return $this->paymentService->do($globalOrderId, $money, $userId, config('wechat.notify_url.offline')); + $parameters = $this->paymentService->do($globalOrderId, $money, $userId, config('wechat.notify_url.offline')); + $parameters['$globalOrderId'] = $globalOrderId; + + return $parameters; } catch (\Exception $e) { Db::rollBack(); $this->log->event(LogLabel::ORDER_OFFLINE_LOG, ['exception_msg' => $e->getMessage()]); diff --git a/config/routes.php b/config/routes.php index 199a63a..f37e0b7 100644 --- a/config/routes.php +++ b/config/routes.php @@ -150,6 +150,7 @@ Router::addGroup('/v3/', function () { Router::post('device/bind', 'App\Controller\v3\DeviceController@bind'); Router::post('device/list', 'App\Controller\v3\DeviceController@list'); Router::post('device/unbind', 'App\Controller\v3\DeviceController@unbind'); + Router::post('orderOffline/completePage', 'App\Controller\v3\OrderOfflineController@completePage'); },['middleware' => [\App\Middleware\Auth\ApiMiddleware::class, \App\Middleware\Auth\UserMiddleware::class]]); // 微信支付回调