From b9adf2dce3d45535c656e00d794b1966c119f14f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 7 Jan 2025 14:33:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor(admin):=20=E4=BC=98=E5=8C=96=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8=E5=92=8C=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E4=BA=A7=E5=93=81=E6=8A=A5=E4=BB=B7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复 ChangeLogLists 类中的搜索字段
- 优化 ChangeLogLists 类的 lists 方法，增加对 admin_name 的处理
- 修改 PurchaseProductOfferLogic 中的 outbound_price 字段名称
- 在 StoreProduct 模型中添加 doNotRecordLog 属性，不生成日志
---
 app/admin/lists/ChangeLogLists.php            | 19 +++++++++++--------
 .../PurchaseProductOfferLogic.php             |  2 +-
 .../model/store_product/StoreProduct.php      |  3 ++-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/admin/lists/ChangeLogLists.php b/app/admin/lists/ChangeLogLists.php
index c2ce43f63..7eb201249 100644
--- a/app/admin/lists/ChangeLogLists.php
+++ b/app/admin/lists/ChangeLogLists.php
@@ -27,7 +27,7 @@ class ChangeLogLists extends BaseAdminDataLists implements ListsSearchInterface
     {
         return [
             '=' => ['model', 'link_id', 'nums', 'pm'],
-            '%like%' => ['mark','url'],
+            '%like%' => ['mark', 'url'],
 
         ];
     }
@@ -45,13 +45,17 @@ class ChangeLogLists extends BaseAdminDataLists implements ListsSearchInterface
     public function lists(): array
     {
         return ChangeLog::where($this->searchWhere)
-            ->field(['id', 'admin_id','model', 'link_id', 'nums', 'pm', 'url', 'mark'])
+            ->field(['id', 'admin_id', 'model', 'link_id', 'nums', 'pm', 'url', 'mark'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
-            ->select()->each(function ($item) {
-                if($item->admin_id){
-                    $item->admin_name = Admin::where('id', $item->admin_id)->value('name');
-                }}
+            ->select()->each(
+                function ($item) {
+                    if ($item->admin_id) {
+                        $item->admin_name = Admin::where('id', $item->admin_id)->value('name');
+                    } else {
+                        $item->admin_name = $item->admin_id;
+                    }
+                }
             )
             ->toArray();
     }
@@ -67,5 +71,4 @@ class ChangeLogLists extends BaseAdminDataLists implements ListsSearchInterface
     {
         return ChangeLog::where($this->searchWhere)->count();
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
index 909780c0f..f4a03517f 100644
--- a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
+++ b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
@@ -171,7 +171,7 @@ class PurchaseProductOfferLogic extends BaseLogic
                 'buyer_nums' => $params['buyer_nums'],
                 'supplier_id' => $params['supplier_id'],
                 'price' => $params['purchase'],
-                'outbound_price' => $params['outbound_price'] ?? 0,
+                'purchase_price' => $params['purchase_price'] ?? 0,
                 'total_price' => $params['total_price'],
                 'pay_type' => $params['pay_type'] ?? 0,
                 'buyer_confirm' => 1,
diff --git a/app/common/model/store_product/StoreProduct.php b/app/common/model/store_product/StoreProduct.php
index 9dcaed539..17b7bf597 100644
--- a/app/common/model/store_product/StoreProduct.php
+++ b/app/common/model/store_product/StoreProduct.php
@@ -20,7 +20,8 @@ class StoreProduct extends BaseModel
     use SoftDelete;
     protected $name = 'store_product';
     protected $deleteTime = 'delete_time';
-
+    // 不生成该表的日志
+    public $doNotRecordLog = true;
 
     public function unitName()
     {