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

feat(warehouse_order): 根据仓库订单调整商品查询逻辑

Browse Source
This commit is contained in:
mkm 2024-09-05 16:10:59 +08:00
parent c57c73b40e
commit 9b6bf999c0
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/admin/controller/warehouse_order/WarehouseOrderController.php
View File

@ -227,7 +227,11 @@ class WarehouseOrderController extends BaseAdminController
$order['total_num'] = 0;
$total_price=0;
foreach ($data as $key => &$value) {
$find = StoreProduct::where('id', $value->product_id)->find();
if(in_array($order['store_id'],[17,18])){
$find = StoreBranchProduct::where('product_id', $value->product_id)->where('store_id',$order['store_id'])->find();
}else{
$find = StoreProduct::where('id', $value->product_id)->find();
}
$value->store_name = $find['store_name'] ?? '';
$value->store_info = $find['store_info'] ?? '';
if($type==2){

11
app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php
View File

@ -63,20 +63,25 @@ class StoreOrderCartInfoTwoLists extends BaseAdminDataLists implements ListsSear
if ($this->request->get('start_time') == '') {
$this->searchWhere[] = ['create_time', 'between', [strtotime(date('Y-m-d 00:00:00')), strtotime(date('Y-m-d 23:59:59'))]];
}
$is_group=$this->request->get('is_group');
$this->searchWhere[] = ['is_pay', '=', 1];
$this->searchWhere[] = ['status', '>=', 0];
$query = StoreOrderCartInfo::where($this->searchWhere);
if ($this->request->get('is_group') == 1) {
if ($is_group == 1) {
$query->field('store_id,product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group(['store_id', 'product_id']);
} else {
$query->field('store_id,product_id,price,total_price,cart_num,create_time');
}
return $query->limit($this->limitOffset, $this->limitLength)
->select()->each(function ($item) {
->select()->each(function ($item) use($is_group){
$find = StoreProduct::where('id', $item['product_id'])->field('image,unit,cate_id,store_name,store_info')->find();
if ($find) {
$item['image'] = $find['image']; //商品图片
$item['store_name'] = $find['store_name']; //商品名称
if($is_group==1){
$item['store_name'] = $find['store_name'].'-'.$item['create_time']; //商品名称
}else{
$item['store_name'] = $find['store_name']; //商品名称
}
$item['store_info'] = $find['store_info']; //商品规格
$item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name') ?? '';
$item['cate_name'] = StoreCategory::where('id', $find['cate_id'])->value('name') ?? '';