mkm/erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新排序

Browse Source
This commit is contained in:
mkm 2024-05-13 17:56:29 +08:00
parent 8c0cd34fa8
commit cdeba5ed4f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/admin/lists/retail/CashierinfoLists.php
View File

@ -54,11 +54,12 @@ class CashierinfoLists extends BaseAdminDataLists implements ListsSearchInterfac
$cashier = Cashierclass::field('number')->where('id',$data['pid'])->findOrEmpty(); $cashier = Cashierclass::field('number')->where('id',$data['pid'])->findOrEmpty();
$room = Db::name('room')->where('id',$data['room'])->find(); $room = Db::name('room')->where('id',$data['room'])->find();
$warehouse = Warehouse::field('name')->where('id',$data['warehouse'])->findOrEmpty(); $warehouse = Warehouse::field('name')->where('id',$data['warehouse'])->findOrEmpty();
$goods = Goods::field('name')->where('id',$data['goods'])->findOrEmpty(); $goods = Goods::field('name,imgs')->where('id',$data['goods'])->findOrEmpty();
$data['cashier_number'] = !$cashier->isEmpty() ? $cashier['number'] : ''; $data['cashier_number'] = !$cashier->isEmpty() ? $cashier['number'] : '';
$data['room_data'] = !empty($room) ? $room : []; $data['room_data'] = !empty($room) ? $room : [];
$data['warehouse_name'] = !$warehouse->isEmpty() ? $warehouse['name'] : ''; $data['warehouse_name'] = !$warehouse->isEmpty() ? $warehouse['name'] : '';
$data['goods_name'] = !$goods->isEmpty() ? $goods['name'] : ''; $data['goods_name'] = !$goods->isEmpty() ? $goods['name'] : '';
$data['imgs'] = !$goods->isEmpty() ? $goods['imgs'] : '';
}) })
->toArray(); ->toArray();
} }

1
app/api/controller/order/RetailOrderController.php
View File

@ -50,6 +50,7 @@ class RetailOrderController extends BaseApiController
$where[] = ['merchant', '=',$this->userInfo['merchant']['mer_id']]; $where[] = ['merchant', '=',$this->userInfo['merchant']['mer_id']];
$where[] = ['paid', '=',1]; $where[] = ['paid', '=',1];
$res = Cashierclass::where($where)->page($page_no, 25)->whereDay('create_time', $date) $res = Cashierclass::where($where)->page($page_no, 25)->whereDay('create_time', $date)
->order('address_id','asc')
->select()->each(function($item){ ->select()->each(function($item){
$item['goods_list']=Cashierinfo::where('pid',$item['id'])->with('goodsName')->field('goods,nums,price sell')->limit(5)->select(); $item['goods_list']=Cashierinfo::where('pid',$item['id'])->with('goodsName')->field('goods,nums,price sell')->limit(5)->select();
$item['goods_count']=count(explode(',',$item['cart_id'])); $item['goods_count']=count(explode(',',$item['cart_id']));