mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
lewis 2025-01-07 14:40:40 +08:00
commit ef7d95a51b
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/admin/lists/ChangeLogLists.php
View File

@ -48,10 +48,14 @@ class ChangeLogLists extends BaseAdminDataLists implements ListsSearchInterface
->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) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function ($item) { ->select()->each(
function ($item) {
if ($item->admin_id) { if ($item->admin_id) {
$item->admin_name = Admin::where('id', $item->admin_id)->value('name'); $item->admin_name = Admin::where('id', $item->admin_id)->value('name');
}} } else {
$item->admin_name = $item->admin_id;
}
}
) )
->toArray(); ->toArray();
} }
@ -67,5 +71,4 @@ class ChangeLogLists extends BaseAdminDataLists implements ListsSearchInterface
{ {
return ChangeLog::where($this->searchWhere)->count(); return ChangeLog::where($this->searchWhere)->count();
} }
} }

2
app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
View File

@ -171,7 +171,7 @@ class PurchaseProductOfferLogic extends BaseLogic
'buyer_nums' => $params['buyer_nums'], 'buyer_nums' => $params['buyer_nums'],
'supplier_id' => $params['supplier_id'], 'supplier_id' => $params['supplier_id'],
'price' => $params['purchase'], 'price' => $params['purchase'],
'outbound_price' => $params['outbound_price'] ?? 0, 'purchase_price' => $params['purchase_price'] ?? 0,
'total_price' => $params['total_price'], 'total_price' => $params['total_price'],
'pay_type' => $params['pay_type'] ?? 0, 'pay_type' => $params['pay_type'] ?? 0,
'buyer_confirm' => 1, 'buyer_confirm' => 1,

3
app/common/model/store_product/StoreProduct.php
View File

@ -20,7 +20,8 @@ class StoreProduct extends BaseModel
use SoftDelete; use SoftDelete;
protected $name = 'store_product'; protected $name = 'store_product';
protected $deleteTime = 'delete_time'; protected $deleteTime = 'delete_time';
// 不生成该表的日志
public $doNotRecordLog = true;
public function unitName() public function unitName()
{ {