diff --git a/beike/Shop/Http/Controllers/Account/OrderController.php b/beike/Shop/Http/Controllers/Account/OrderController.php index 8e40dce5..e1d49dc7 100644 --- a/beike/Shop/Http/Controllers/Account/OrderController.php +++ b/beike/Shop/Http/Controllers/Account/OrderController.php @@ -11,6 +11,7 @@ namespace Beike\Shop\Http\Controllers\Account; +use Beike\Services\StateMachineService; use Illuminate\Http\Request; use Beike\Repositories\OrderRepo; use Illuminate\Contracts\View\View; @@ -81,4 +82,21 @@ class OrderController extends Controller $order = OrderRepo::getOrderByNumber($number, $customer); return (new PaymentService($order))->pay(); } + + + /** + * 订单完成 + * + * @param Request $request + * @param $number + * @return array + * @throws \Exception + */ + public function complete(Request $request, $number) + { + $customer = current_customer(); + $order = OrderRepo::getOrderByNumber($number, $customer); + StateMachineService::getInstance($order)->changeStatus(StateMachineService::COMPLETED); + return json_success(trans('shop/account.order_completed')); + } } diff --git a/resources/lang/en/shop/account.php b/resources/lang/en/shop/account.php index 554ace6a..b1f61bb1 100644 --- a/resources/lang/en/shop/account.php +++ b/resources/lang/en/shop/account.php @@ -20,5 +20,6 @@ return [ 'order' => [ 'index' => 'Order List', + 'order_completed' => 'Completed Order', ] ]; diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php index 6af15539..9f02bb0c 100644 --- a/resources/lang/zh_cn/shop/account.php +++ b/resources/lang/zh_cn/shop/account.php @@ -19,5 +19,6 @@ return [ 'order' => [ 'index' => '订单列表', + 'order_completed' => '已确认收货', ] ];