diff --git a/app/admin/lists/retail/CashierinfoLists.php b/app/admin/lists/retail/CashierinfoLists.php index b7b6ead..7d9b46e 100644 --- a/app/admin/lists/retail/CashierinfoLists.php +++ b/app/admin/lists/retail/CashierinfoLists.php @@ -54,11 +54,12 @@ class CashierinfoLists extends BaseAdminDataLists implements ListsSearchInterfac $cashier = Cashierclass::field('number')->where('id',$data['pid'])->findOrEmpty(); $room = Db::name('room')->where('id',$data['room'])->find(); $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['room_data'] = !empty($room) ? $room : []; $data['warehouse_name'] = !$warehouse->isEmpty() ? $warehouse['name'] : ''; $data['goods_name'] = !$goods->isEmpty() ? $goods['name'] : ''; + $data['imgs'] = !$goods->isEmpty() ? $goods['imgs'] : ''; }) ->toArray(); } diff --git a/app/api/controller/order/RetailOrderController.php b/app/api/controller/order/RetailOrderController.php index 019da4e..6fad72b 100644 --- a/app/api/controller/order/RetailOrderController.php +++ b/app/api/controller/order/RetailOrderController.php @@ -50,6 +50,7 @@ class RetailOrderController extends BaseApiController $where[] = ['merchant', '=',$this->userInfo['merchant']['mer_id']]; $where[] = ['paid', '=',1]; $res = Cashierclass::where($where)->page($page_no, 25)->whereDay('create_time', $date) + ->order('address_id','asc') ->select()->each(function($item){ $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']));