From 025134aacdbe92447abdc03066f944061f733ce3 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 22 Jun 2024 16:21:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 1 + app/api/controller/store/StoreController.php | 4 ++ .../lists/store_order/StoreOrderLists.php | 43 ++++++++++--------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index e8d8e5c1d..5f6e4314b 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -90,6 +90,7 @@ class UserLogic extends BaseLogic 'password' => $password, 'mobile' => $params['mobile'], 'user_ship' => $params['user_ship']??0, + 'label_id' => $params['label_id']??0, ]; $res=User::create($data); diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index 97bd8068d..0817407a5 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -54,6 +54,7 @@ class StoreController extends BaseApiController { $params = (new UserValidate())->post()->goCheck('rechargeStoreMoney'); $auth_code = $this->request->post('auth_code'); //微信支付条码 + $recharge_type = $this->request->post('recharge_type',''); //微信支付条码 $find=User::where('mobile',$params['mobile'])->find(); if(!$find){ $find=UserUserLogic::StoreAdd($params); @@ -61,6 +62,9 @@ class StoreController extends BaseApiController $find['real_name']=$params['real_name']; $find->save(); } + if($recharge_type!='INDUSTRYMEMBERS'){ + return $this->success('添加用户成功'); + } $data=[ 'store_id'=>$params['store_id'], 'uid'=>$find['id'], diff --git a/app/store/lists/store_order/StoreOrderLists.php b/app/store/lists/store_order/StoreOrderLists.php index db3af46d6..77cdfd819 100644 --- a/app/store/lists/store_order/StoreOrderLists.php +++ b/app/store/lists/store_order/StoreOrderLists.php @@ -28,7 +28,7 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface public function setSearch(): array { return [ - '=' => ['pay_type','paid'], + '=' => ['pay_type', 'paid'], '%like%' => ['order_id'], 'between_time' => 'create_time', ]; @@ -46,37 +46,40 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface */ public function lists(): array { - $store_id = $this->adminInfo['store_id']??5; - $is_sashier=$this->request->get('is_sashier'); - if($is_sashier==1){//收银台订单 - $this->searchWhere[] = ['store_id' ,'=',$store_id]; - $this->searchWhere[] = ['pay_type','in',[17,9,13,18]]; - }elseif($is_sashier==2){//小程序订单 - $this->searchWhere[] = ['pay_type','in',[7,3,18]]; + $store_id = $this->adminInfo['store_id'] ?? 5; + $is_sashier = $this->request->get('is_sashier'); + if ($is_sashier == 1) { //收银台订单 + $this->searchWhere[] = ['store_id', '=', $store_id]; + $this->searchWhere[] = ['pay_type', 'in', [17, 9, 13, 18]]; + } elseif ($is_sashier == 2) { //小程序订单 + $this->searchWhere[] = ['pay_type', 'in', [7, 3, 18]]; } - return StoreOrder::where($this->searchWhere) - ->field(['id', 'order_id', 'pay_price', 'pay_time', 'pay_type', 'status','paid','total_num']) + return StoreOrder::where($this->searchWhere) + ->field(['id', 'order_id', 'pay_price', 'pay_time', 'pay_type', 'status', 'paid', 'total_num']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) use ($store_id) { - if(empty($item['pay_time'])){ + if (empty($item['pay_time'])) { $item['pay_time'] = ''; + }else{ + $item['pay_time'] = date('Y-m-d H:i:s', $item['pay_time']); } -// $item['pay_time'] = $item['pay_time'] > 0 ? date('Y-m-d H:i:s', $item['pay_time']) : ''; - $item['pay_type_name'] =PayEnum::getPaySceneDesc($item['pay_type']) ?? ''; + $item['pay_type_name'] = PayEnum::getPaySceneDesc($item['pay_type']) ?? ''; $item['status_name'] = OrderEnum::getOrderType($item['status']) ?? ''; if ($item['paid'] == 0) { $item['paid_name'] = '待支付'; - }else{ + } else { $item['paid_name'] = '已支付'; } - $product_id = StoreOrderCartInfo::where('oid', $item['id'])->limit(3)->column('product_id'); - if ($product_id) { - $item['product_info'] = StoreBranchProduct::whereIn('product_id' ,$product_id)->where('store_id', $store_id)->field(['product_id', 'store_name', 'image', 'price']) - ->select(); - } else { - $item['product_info'] = []; + $product = StoreOrderCartInfo::where('oid', $item['id'])->field(['id', 'oid', 'product_id', 'cart_info']) + ->limit(3)->select(); + foreach ($product as &$items) { + $items['store_name'] = $items['cart_info']['name']; + $items['image'] = $items['cart_info']['image']; + $items['price'] = $items['cart_info']['price']; + unset($items['cart_info']); } + $item['product_info'] = $product; return $item; }) ->toArray();