From fc0d73e55fa07a4d459b243b7eb9dac861ab0f32 Mon Sep 17 00:00:00 2001 From: liapples Date: Sun, 5 Sep 2021 10:52:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E5=8D=95=E5=88=A4?= =?UTF-8?q?=E6=96=ADwhere=E5=92=8Creturn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/OrderController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php index a74eb59..48f1504 100644 --- a/app/Http/Controllers/Api/OrderController.php +++ b/app/Http/Controllers/Api/OrderController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Api; use App\Common\PayType; +use App\Common\ProductStatus; use App\Http\Controllers\Controller; use App\Models\Agent; use App\Models\AgentProduct; @@ -127,12 +128,13 @@ class OrderController extends Controller ]); $ap = AgentProduct::query() - ->where('id', $formData['id']) + ->where(['id' => $formData['id'], 'status' => ProductStatus::ON_SALE]) + ->where('stock', '>=', $formData['num']) ->with(['coupon', 'product', 'agentCloudProduct:id,price']) ->has('product') ->first(); if (!$ap || !$ap->product) { - $this->error('产品不存在或已下架'); + return $this->error('产品已下架或库存不足'); } $coupon_ids = []; @@ -189,7 +191,7 @@ class OrderController extends Controller 'guide_id' => $ap->guide_id, 'timeout' => $timeout, 'agent_cloud_pid' => $ap->agent_cloud_pid, - 'agent_cloud_price' => $ap->agentCloudProduct->price, + 'agent_cloud_price' => $ap->agentCloudProduct->price ?? 0, ]); //存入订单产品表