From 9b09b3c64306a4e25258be688104ade4408cab15 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 21 Nov 2024 16:36:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor(warehouse):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在创建订单时增加供应商 ID 和支付类型字段
- 使用 ternary operator 默认值设置供应商 ID 和支付类型
---
 app/admin/logic/warehouse_order/WarehouseOrderLogic.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php
index 91144e113..f2e976072 100644
--- a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php
+++ b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php
@@ -96,10 +96,11 @@ class WarehouseOrderLogic extends BaseLogic
         try {
             foreach ($params['product_arr'] as $k => $v) {
                 $data['order_type'] = $order_type;
+                $data['supplier_id'] = $v['supplier_id']??0;
+                $data['pay_type'] = $v['pay_type']??0;
                 $data['admin_id'] = $params['admin_id'];
                 $data['store_id'] = $find['store_id'];
                 $data['oid'] = $find['id'];
-                $data['supplier_id'] = $find['supplier_id'];
                 $data['warehouse_id'] = $find['warehouse_id'];
                 $data['code'] = $find['code'];
                 $data['product_id'] = $v['id'];

From bc4a9554b5c75f020fbbcef699a717ba583ad32e Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 21 Nov 2024 16:47:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(user):=20=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=97=A5=E5=BF=97=E8=AE=A2=E5=8D=95=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 扩展日志查询条件，增加对 'purchase_refund' 类别的支持
- 使用 in_array() 替代等号比较，提高代码可读性和可扩展性
---
 app/admin/logic/user/UserLogic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php
index 577c8f7ec..5638c46ae 100644
--- a/app/admin/logic/user/UserLogic.php
+++ b/app/admin/logic/user/UserLogic.php
@@ -296,7 +296,7 @@ class UserLogic extends BaseLogic
                     ->order('id', 'desc')
                     ->select()->toArray();
                 foreach ($data as &$value) {
-                    if ($value['category'] == 'user_order_purchase_pay') {
+                    if (in_array($value['category'],['user_order_purchase_pay','purchase_refund'])) {
                         $value['order_sn'] = StoreOrder::where('id', $value['link_id'])->value('order_id');
                     } elseif ($value['category'] == 'user_balance_recharge') {
                         $value['order_sn'] =  UserRecharge::where('id', $value['link_id'])->value('order_id');