From e1bece7622ac21e3871572c6097bf0bb35a148e9 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 13 Aug 2024 14:19:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=95=86=E6=88=B7=E6=9F=A5=E7=9C=8B=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/order/OrderController.php | 11 ++- app/api/lists/order/StoreOrderList.php | 98 ++++++++++++++++++++ app/api/lists/product/StoreProductLists.php | 2 +- 3 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 app/api/lists/order/StoreOrderList.php diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index 03840335..f60a26e6 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -6,6 +6,7 @@ use app\admin\logic\store_order\StoreOrderLogic; use app\api\logic\order\OrderLogic; use app\api\controller\BaseApiController; use app\api\lists\order\OrderList; +use app\api\lists\order\StoreOrderList; use app\api\validate\OrderValidate; use app\common\enum\PayEnum; use app\common\enum\YesNoEnum; @@ -34,7 +35,15 @@ class OrderController extends BaseApiController return $this->dataLists(new OrderList()); } - + /** + * 小程序商户查看订单列表 + */ + public function store_order_list() + { + $store_id=SystemStoreStaff::where('uid',$this->userId)->value('store_id'); + $this->request->__set('store_id',$store_id); + return $this->dataLists(new StoreOrderList()); + } /** * 核销码查数据 */ diff --git a/app/api/lists/order/StoreOrderList.php b/app/api/lists/order/StoreOrderList.php new file mode 100644 index 00000000..f1acbc9d --- /dev/null +++ b/app/api/lists/order/StoreOrderList.php @@ -0,0 +1,98 @@ + ['paid', 'status', 'is_writeoff','reservation'], + 'between_time' => 'create_time', + '%like%' => ['order_id'], + ]; + } + + + /** + * @notes 零售订单列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @date 2024/04/27 11:26 + */ + public function lists(): array + { + $store_id = $this->request->__get('store_id'); + if (!$store_id) return []; + $this->searchWhere[]=['paid','=',1]; + $this->searchWhere[]=['store_id','=',$store_id]; + $data = StoreOrder::where($this->searchWhere) + ->whereIn('shipping_type',[1,2]) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->each(function ($item) { + $item['goods_list'] = StoreOrderCartInfo::where('oid', $item['id']) + ->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time,cart_info')->limit(3)->select() + ->each(function ($v) use ($item) { + $v['store_name'] = ''; + $v['image'] = ''; + $v['price'] = ''; + $v['unit_name']=''; + if(isset($v['cart_info'])){ + // foreach( $v['cart_info'] as $k=>$vv){ + $v['store_name'] =$v['cart_info']['name']; + $v['image'] =$v['cart_info'] ['image']; + $v['price'] = $v['cart_info']['price']; + $v['unit_name']=$v['cart_info']['unit_name']??''; + // } + + } + }); + $item['goods_count'] = count(explode(',', $item['cart_id'])); + if ($item['refund_reason_time']) { + $item['refund_reason_time'] = date('Y-m-d H:i:s', $item['refund_reason_time']); + } + if ($item['pay_time']) { + $item['pay_time'] = date('Y-m-d H:i:s', $item['pay_time']); + } + }) + ->toArray(); + + return $data; + } + + + /** + * @notes 零售订单数量 + * @return int + * @date 2024/04/27 11:26 + */ + public function count(): int + { + $store_id = $this->request->__get('store_id'); + if (!$store_id) return 0; + return StoreOrder::where($this->searchWhere)->whereIn('shipping_type',[1,2])->count(); + } +} diff --git a/app/api/lists/product/StoreProductLists.php b/app/api/lists/product/StoreProductLists.php index 8bb568d0..f9c4b2d0 100644 --- a/app/api/lists/product/StoreProductLists.php +++ b/app/api/lists/product/StoreProductLists.php @@ -82,7 +82,7 @@ class StoreProductLists extends BaseApiDataLists implements ListsSearchInterface if($type==1){ $fields = 'id,product_id,cate_id,store_name,cost,store_id,vip_price,purchase,cost price,bar_code,image,sales,store_info,delete_time,unit,batch,top_cate_id,two_cate_id,stock'; }elseif($type==2){ - $fields = 'id,product_id,cate_id,store_name,cost,store_id,vip_price,purchase,vip_price price,bar_code,image,sales,store_info,delete_time,unit,batch,top_cate_id,two_cate_id,stock'; + $fields = 'id,product_id,cate_id,store_name,cost,store_id,vip_price,purchase,purchase price,bar_code,image,sales,store_info,delete_time,unit,batch,top_cate_id,two_cate_id,stock'; } $this->searchWhere[] = ['status', '=', 1];