diff --git a/app/Models/OrderProduct.php b/app/Models/OrderProduct.php index ab630b47..f159e828 100644 --- a/app/Models/OrderProduct.php +++ b/app/Models/OrderProduct.php @@ -50,14 +50,23 @@ class OrderProduct extends Model } /** - * 关联的订单包裹 - * - */ + * 关联的订单包裹 + * + */ public function packages() { return $this->belongsToMany(OrderPackage::class, 'order_package_products', 'order_product_id', 'order_package_id'); } + /** + * 此订单商品所属的SKU + * + */ + public function sku() + { + return $this->belongsTo(ProductSku::class, 'sku_id'); + } + /** * 获取订单商品是否能发起售后 * diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php index 21e1223e..61d278f3 100644 --- a/app/Services/OrderService.php +++ b/app/Services/OrderService.php @@ -185,7 +185,10 @@ class OrderService 'updated_at' => $order->updated_at, ]; - $this->deductSkuStock($sku, $product['quantity']); + // 扣商品库存 + $sku->update([ + 'stock' => DB::raw("stock - {$product['quantity']}"), // 库存 + ]); } OrderProduct::insert($data); @@ -196,25 +199,6 @@ class OrderService return $order; } - /** - * 扣除商品库存 - * - * @param \App\Models\ProductSku $sku - * @param int $quantity - * @return void - */ - protected function deductSkuStock(ProductSku $sku, int $quantity): void - { - $sku->update([ - 'stock' => DB::raw("stock - {$quantity}"), // 库存 - 'sales' => DB::raw("sales + {$quantity}"), // 销量 - ]); - - $sku->spu->update([ - 'sales' => DB::raw("sales + {$quantity}"), // 销量 - ]); - } - /** * 确认快速下单 * @@ -687,6 +671,12 @@ class OrderService ]); } + $products = $order->products()->get(); + + foreach ($products->load('sku') as $product) { + $product->sku?->increment('stock', $product->quantity); + } + $order->update([ 'status' => Order::STATUS_CANCELLED, ]);