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

Merge pull request '1. 在BeforehandOrderCartInfoLists类中添加了备注字段到显示列表中。' (#269) from dev into main

Browse Source 
Reviewed-on: #269
This commit is contained in:
mkm 2024-10-15 14:11:35 +08:00
commit 89216d6a42
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php
View File

@ -120,6 +120,7 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe
'unit_name' => '单位',
'price' => '单价',
'total_price' => '总价',
'mark' => '备注',
];
return $data;
}

2
app/admin/logic/warehouse_product/WarehouseProductLogic.php
View File

@ -165,7 +165,7 @@ class WarehouseProductLogic extends BaseLogic
$total_price = bcmul($after_nums, $params['purchase'], 2);
WarehouseProductStorege::update(['nums' =>bcsub($storege['nums'], $params['nums']), 'total_price' => $total_price], ['id' => $storege['id']]);
} else {
throw new BusinessException('仓库商品不存在');
throw new BusinessException('仓库商品不存在'.'|'.$params['product_id']);
}
$batch_count = WarehouseProduct::where(['product_id' => $params['product_id'], 'warehouse_id' => $params['warehouse_id'], 'financial_pm' => $params['financial_pm'], 'store_id' => $params['store_id']])->count();

3
app/common/cache/AdminTokenCache.php vendored
View File

@ -5,6 +5,7 @@ namespace app\common\cache;
use app\common\model\auth\Admin;
use app\common\model\auth\AdminJobs;
use app\common\model\auth\AdminSession;
use app\common\model\auth\SystemRole;
use app\common\model\BaseModel;
@ -78,8 +79,10 @@ class AdminTokenCache extends BaseCache
if(isset($auth_shop)){
$supplier_id=$auth_shop['pid'];
}
$job_ids=AdminJobs::where('admin_id',$admin->id)->column('jobs_id');
$adminInfo = [
'admin_id' => $admin->id,
'job_ids' => $job_ids,
'supplier_id' => $supplier_id,
'root' => $admin->root,
'name' => $admin->name,