From ec52c4b18d817c47d632dbb15fed61eca3350b41 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Sat, 8 Jan 2022 15:55:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E5=8C=85=E8=A3=B9?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Services/OrderPackageService.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Admin/Services/OrderPackageService.php b/app/Admin/Services/OrderPackageService.php
index 2774c8f7..37e27989 100644
--- a/app/Admin/Services/OrderPackageService.php
+++ b/app/Admin/Services/OrderPackageService.php
@@ -42,7 +42,8 @@ class OrderPackageService
             }
         }
         foreach ($packageProducts as $product) {
-            $_orderProduct = OrderProduct::where('after_sale_state', '<>', 1)
+            $_orderProduct = OrderProduct::where('order_id', $order->id)
+                ->where('after_sale_state', '<>', 1)
                 ->where('remain_quantity', '>=', $product['quantity'])
                 ->find($product['order_product_id']);
             if (is_null($_orderProduct)) {