pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

兼容老版本

release
李静 2022-02-17 15:01:19 +08:00
parent 8dd8b903e0
commit 7f1c8b8b09
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Endpoint/Api/Http/Controllers/Order/OrderController.php
View File

@ -2,6 +2,7 @@
namespace App\Endpoint\Api\Http\Controllers\Order; namespace App\Endpoint\Api\Http\Controllers\Order;
use App\Constants\Device;
use App\Endpoint\Api\Http\Controllers\Controller; use App\Endpoint\Api\Http\Controllers\Controller;
use App\Endpoint\Api\Http\Resources\OrderPackageResource; use App\Endpoint\Api\Http\Resources\OrderPackageResource;
use App\Endpoint\Api\Http\Resources\OrderResource; use App\Endpoint\Api\Http\Resources\OrderResource;
@ -132,11 +133,20 @@ class OrderController extends Controller
public function confirm($id, Request $request) public function confirm($id, Request $request)
{ {
$user = $request->user(); $user = $request->user();
$clientApp = $request->header('client-app', Device::UNIAPP);
$clientVersion = $request->header('client-version');
DB::transaction(function () use ($id, $user) { DB::transaction(function () use ($id, $user, $clientApp, $clientVersion) {
$order = $user->orders()->lockForUpdate()->findOrFail($id); $order = $user->orders()->lockForUpdate()->findOrFail($id);
(new OrderService())->confirm($order, true); // 订单是否可结算
$isSettlable = false;
if ($clientApp === Device::UNIAPP && version_compare($clientVersion, '1.3.4', '<')) {
$isSettlable = true;
}
(new OrderService())->confirm($order, $isSettlable);
}); });
return response()->noContent(); return response()->noContent();