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() {