From b152fbab4ab2e955b2dec6317447816d30a1040f Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Mon, 24 Jan 2022 11:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=97=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=89=A9=E4=BD=99=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Forms/OrderPackage.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/Admin/Forms/OrderPackage.php b/app/Admin/Forms/OrderPackage.php
index 541a52b0..3699c2a5 100644
--- a/app/Admin/Forms/OrderPackage.php
+++ b/app/Admin/Forms/OrderPackage.php
@@ -78,8 +78,19 @@ class OrderPackage extends Form implements LazyRenderable
             '德邦快递'=>'德邦快递',
         ])->default('韵达快递')->required();
         $this->text('shipping_number')->required();
-        $this->hasMany('packages', function (Form $form) use ($order) {
-            $form->select('order_product_id')->options($order->products()->where('after_sale_state', '<>', 1)->pluck('name', 'id'));
+        $products = $order->products->filter(function ($items) {
+            if ($items->after_sale_state != 1) {
+                return true;
+            } else {
+                return false;
+            }
+        });
+        $options= [];
+        $products->map(function ($item, $key) use (&$options) {
+            $options[$item->id]= '剩余【'.$item->remain_quantity.'】'.$item->name;
+        });
+        $this->hasMany('packages', function (Form $form) use ($options) {
+            $form->select('order_product_id')->options($options);
             $form->number('quantity')->min(1);
         });