From 584e20a7d0748b8aaed23ec1be11b204d05ac94c Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 13 Dec 2024 12:00:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(StoreProductLists):=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=9B=B6=E9=87=87=E5=95=86=E5=93=81=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 StoreProductLists 类中添加了零采商品（product_type_id 为 6）的名称
- 扩展了产品类型列表，支持零采商品的显示
---
 app/admin/lists/store_product/StoreProductLists.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/admin/lists/store_product/StoreProductLists.php b/app/admin/lists/store_product/StoreProductLists.php
index d5e81d258..9abcc58f6 100644
--- a/app/admin/lists/store_product/StoreProductLists.php
+++ b/app/admin/lists/store_product/StoreProductLists.php
@@ -112,6 +112,9 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
                     case 5:
                         $item['product_type_name'] = '批发产品';
                         break;
+                        case 6:
+                        $item['product_type_name'] = '零采商品';
+                        break;
                     default:
                         $item['product_type_name'] = '普通商品';
                 }

From 5aa27579dfd5d16fc0ace6e90bf7d977cc0a3fb5 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 13 Dec 2024 17:27:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(beforehand=5Forder):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8E=A5=E8=B4=A7=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 BeforehandOrderLogic 中添加 accept_num 字段
- 在 BeforehandOrderCartInfoLogic 中添加 accept_num 字段
- 更新两个逻辑类以支持新的接货数量功能
---
 app/admin/logic/beforehand_order/BeforehandOrderLogic.php        | 1 +
 .../beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
index f6c83cf45..c457c2fea 100644
--- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
+++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
@@ -440,6 +440,7 @@ class BeforehandOrderLogic extends BaseLogic
                 $datas[$k]['product_id'] = $v['product_id'];
                 $datas[$k]['uid'] = $uid;
                 $datas[$k]['cart_num'] = $v['cart_num'];
+                $datas[$k]['accept_num'] = $v['accept_num'];
                 $datas[$k]['purchase'] = $v['purchase'];
                 $datas[$k]['price'] = $v['price'];
                 $datas[$k]['total_price'] = $v['total_price'];
diff --git a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
index 204b35b16..301d8224b 100644
--- a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
+++ b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
@@ -69,6 +69,7 @@ class BeforehandOrderCartInfoLogic extends BaseLogic
                 $datas[$k]['uid'] = $uid;
                 $datas[$k]['bhoid'] = $bhoid;
                 $datas[$k]['cart_num'] = $v['nums'];
+                $datas[$k]['accept_num'] = $v['nums'];
                 $datas[$k]['price'] = $v['purchase'];
                 $datas[$k]['total_price'] = $v['total_price'];
                 $datas[$k]['pay_price'] = $v['total_price'];